From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 27 Oct 2020 17:54:33 +0000 (-0500)
Subject: Merge branch 'develop' into feature/account-export
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=291189357b2140db6d6ff1f51522e597690f9fb5;p=akkoma

Merge branch 'develop' into feature/account-export
---

291189357b2140db6d6ff1f51522e597690f9fb5
diff --cc CHANGELOG.md
index ec6228280,ac91d4d9e..2f49df2c9
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -12,7 +12,8 @@@ The format is based on [Keep a Changelo
  - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
  - Pleroma API: Importing the mutes users from CSV files.
  - Experimental websocket-based federation between Pleroma instances.
+ - App metrics: ability to restrict access to specified IP whitelist.
 +- Account backup
  
  ### Changed
  
diff --cc config/description.exs
index 609ea4551,55363c45a..0e8285280
--- a/config/description.exs
+++ b/config/description.exs
@@@ -3723,24 -3717,41 +3723,61 @@@ config :pleroma, :config_description, 
        }
      ]
    },
 +  %{
 +    group: :pleroma,
 +    key: Pleroma.User.Backup,
 +    type: :group,
 +    description: "Account Backup",
 +    children: [
 +      %{
 +        key: :purge_after_days,
 +        type: :integer,
 +        description: "Remove backup achives after N days",
 +        suggestions: [30]
 +      },
 +      %{
 +        key: :limit_days,
 +        type: :integer,
 +        description: "Limit user to export not more often than once per N days",
 +        suggestions: [7]
 +      }
 +    ]
++  },
+   %{
+     group: :prometheus,
+     key: Pleroma.Web.Endpoint.MetricsExporter,
+     type: :group,
+     description: "Prometheus app metrics endpoint configuration",
+     children: [
+       %{
+         key: :enabled,
+         type: :boolean,
+         description: "[Pleroma extension] Enables app metrics endpoint."
+       },
+       %{
+         key: :ip_whitelist,
+         type: [{:list, :string}, {:list, :charlist}, {:list, :tuple}],
+         description:
+           "[Pleroma extension] If non-empty, restricts access to app metrics endpoint to specified IP addresses."
+       },
+       %{
+         key: :auth,
+         type: [:boolean, :tuple],
+         description: "Enables HTTP Basic Auth for app metrics endpoint.",
+         suggestion: [false, {:basic, "myusername", "mypassword"}]
+       },
+       %{
+         key: :path,
+         type: :string,
+         description: "App metrics endpoint URI path.",
+         suggestions: ["/api/pleroma/app_metrics"]
+       },
+       %{
+         key: :format,
+         type: :atom,
+         description: "App metrics endpoint output format.",
+         suggestions: [:text, :protobuf]
+       }
+     ]
    }
  ]