forked from AkkomaGang/akkoma
allow disabling prometheus entirely
This commit is contained in:
parent
6d8e4d5e05
commit
48d302a60f
6 changed files with 27 additions and 9 deletions
|
@ -259,7 +259,8 @@ config :pleroma, :instance,
|
||||||
profile_directory: true,
|
profile_directory: true,
|
||||||
privileged_staff: false,
|
privileged_staff: false,
|
||||||
local_bubble: [],
|
local_bubble: [],
|
||||||
max_frontend_settings_json_chars: 100_000
|
max_frontend_settings_json_chars: 100_000,
|
||||||
|
export_prometheus_metrics: true
|
||||||
|
|
||||||
config :pleroma, :welcome,
|
config :pleroma, :welcome,
|
||||||
direct_message: [
|
direct_message: [
|
||||||
|
|
|
@ -964,6 +964,11 @@ config :pleroma, :config_description, [
|
||||||
type: {:list, :string},
|
type: {:list, :string},
|
||||||
description:
|
description:
|
||||||
"List of instances that make up your local bubble (closely-related instances). Used to populate the 'bubble' timeline (domain only)."
|
"List of instances that make up your local bubble (closely-related instances). Used to populate the 'bubble' timeline (domain only)."
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
key: :export_prometheus_metrics,
|
||||||
|
type: :boolean,
|
||||||
|
description: "Enable prometheus metrics (at /api/v1/akkoma/metrics)"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
@ -7,6 +7,8 @@ To facilitate this, akkoma exposes prometheus metrics to be scraped.
|
||||||
|
|
||||||
## Prometheus
|
## Prometheus
|
||||||
|
|
||||||
|
See: [export_prometheus_metrics](../configuration/cheatsheet#instance)
|
||||||
|
|
||||||
To scrape prometheus metrics, we need an oauth2 token with the `admin:metrics` scope.
|
To scrape prometheus metrics, we need an oauth2 token with the `admin:metrics` scope.
|
||||||
|
|
||||||
consider using [constanze](https://akkoma.dev/AkkomaGang/constanze) to make this easier -
|
consider using [constanze](https://akkoma.dev/AkkomaGang/constanze) to make this easier -
|
||||||
|
|
|
@ -62,6 +62,7 @@ To add configuration to your config file, you can copy it from the base config.
|
||||||
* `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
|
* `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
|
||||||
* `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
|
* `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
|
||||||
* `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
|
* `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
|
||||||
|
* `export_prometheus_metrics`: Enable prometheus metrics, served at `/api/v1/akkoma/metrics`, requiring the `admin:metrics` oauth scope.
|
||||||
|
|
||||||
## :database
|
## :database
|
||||||
* `improved_hashtag_timeline`: Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes).
|
* `improved_hashtag_timeline`: Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes).
|
||||||
|
|
|
@ -2,6 +2,7 @@ defmodule Pleroma.Web.AkkomaAPI.MetricsController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
alias Pleroma.Web.Plugs.OAuthScopesPlug
|
alias Pleroma.Web.Plugs.OAuthScopesPlug
|
||||||
|
alias Pleroma.Config
|
||||||
|
|
||||||
plug(
|
plug(
|
||||||
OAuthScopesPlug,
|
OAuthScopesPlug,
|
||||||
|
@ -12,9 +13,12 @@ defmodule Pleroma.Web.AkkomaAPI.MetricsController do
|
||||||
)
|
)
|
||||||
|
|
||||||
def show(conn, _params) do
|
def show(conn, _params) do
|
||||||
stats = TelemetryMetricsPrometheus.Core.scrape()
|
if Config.get([:instance, :export_prometheus_metrics], true) do
|
||||||
|
conn
|
||||||
conn
|
|> text(TelemetryMetricsPrometheus.Core.scrape())
|
||||||
|> text(stats)
|
else
|
||||||
|
conn
|
||||||
|
|> send_resp(404, "Not Found")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
defmodule Pleroma.Web.AkkomaAPI.MetricsControllerTest do
|
defmodule Pleroma.Web.AkkomaAPI.MetricsControllerTest do
|
||||||
use Pleroma.Web.ConnCase, async: true
|
use Pleroma.Web.ConnCase, async: true
|
||||||
|
|
||||||
import Pleroma.Factory
|
|
||||||
alias Pleroma.Akkoma.FrontendSettingsProfile
|
|
||||||
|
|
||||||
describe "GET /api/v1/akkoma/metrics" do
|
describe "GET /api/v1/akkoma/metrics" do
|
||||||
test "should return metrics when the user has admin:metrics" do
|
test "should return metrics when the user has admin:metrics" do
|
||||||
%{conn: conn} = oauth_access(["admin:metrics"])
|
%{conn: conn} = oauth_access(["admin:metrics"])
|
||||||
|
@ -16,9 +13,17 @@ defmodule Pleroma.Web.AkkomaAPI.MetricsControllerTest do
|
||||||
|
|
||||||
test "should not allow users that do not have the admin:metrics scope" do
|
test "should not allow users that do not have the admin:metrics scope" do
|
||||||
%{conn: conn} = oauth_access(["read:metrics"])
|
%{conn: conn} = oauth_access(["read:metrics"])
|
||||||
resp = conn
|
conn
|
||||||
|> get("/api/v1/akkoma/metrics")
|
|> get("/api/v1/akkoma/metrics")
|
||||||
|> json_response(403)
|
|> json_response(403)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "should be disabled by export_prometheus_metrics" do
|
||||||
|
clear_config([:instance, :export_prometheus_metrics], false)
|
||||||
|
%{conn: conn} = oauth_access(["admin:metrics"])
|
||||||
|
conn
|
||||||
|
|> get("/api/v1/akkoma/metrics")
|
||||||
|
|> response(404)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue