From ab705cd4747d3ac48ab44e58a5be1ae637b88a3e Mon Sep 17 00:00:00 2001 From: PingDavidR Date: Wed, 27 Mar 2024 13:54:21 -0500 Subject: [PATCH 1/4] removing outdated dsconfig settings for prometheus --- .../dsconfig/15-prometheus-stats.dsconfig | 18 ------------------ .../dsconfig/15-prometheus-stats.dsconfig | 18 ------------------ 2 files changed, 36 deletions(-) delete mode 100644 monitoring/pingdatagovernance/pd.profile/dsconfig/15-prometheus-stats.dsconfig delete mode 100644 monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus-stats.dsconfig diff --git a/monitoring/pingdatagovernance/pd.profile/dsconfig/15-prometheus-stats.dsconfig b/monitoring/pingdatagovernance/pd.profile/dsconfig/15-prometheus-stats.dsconfig deleted file mode 100644 index 311289386..000000000 --- a/monitoring/pingdatagovernance/pd.profile/dsconfig/15-prometheus-stats.dsconfig +++ /dev/null @@ -1,18 +0,0 @@ -# Enable the stats collector and the statsd monitoring endpoint -# so that PD metrics can be sent to the statsd exporter -# and then scraped by prometheus. - -# Create a StatsD monitoring endpoint -dsconfig create-monitoring-endpoint \ - --type statsd \ - --endpoint-name StatsDExporterEndpoint \ - --set enabled:true \ - --set hostname:localhost \ - --set server-port:8125 \ - --set connection-type:unencrypted-udp - -# Enable the Stats Collector -dsconfig set-plugin-prop \ - --plugin-name "Stats Collector" \ - --set enabled:true \ - --set server-info:extended \ No newline at end of file diff --git a/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus-stats.dsconfig b/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus-stats.dsconfig deleted file mode 100644 index 311289386..000000000 --- a/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus-stats.dsconfig +++ /dev/null @@ -1,18 +0,0 @@ -# Enable the stats collector and the statsd monitoring endpoint -# so that PD metrics can be sent to the statsd exporter -# and then scraped by prometheus. - -# Create a StatsD monitoring endpoint -dsconfig create-monitoring-endpoint \ - --type statsd \ - --endpoint-name StatsDExporterEndpoint \ - --set enabled:true \ - --set hostname:localhost \ - --set server-port:8125 \ - --set connection-type:unencrypted-udp - -# Enable the Stats Collector -dsconfig set-plugin-prop \ - --plugin-name "Stats Collector" \ - --set enabled:true \ - --set server-info:extended \ No newline at end of file From 324b1f12913123039d49b4af3f0f602457c038ce Mon Sep 17 00:00:00 2001 From: PingDavidR Date: Wed, 27 Mar 2024 15:14:28 -0500 Subject: [PATCH 2/4] add files back with new config --- .../pd.profile/dsconfig/15-prometheus.dsconfig | 13 +++++++++++++ .../pd.profile/dsconfig/15-prometheus.dsconfig | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig create mode 100644 monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig diff --git a/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig new file mode 100644 index 000000000..789b4454e --- /dev/null +++ b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig @@ -0,0 +1,13 @@ +# Configure and enable the HTTP servlet extension for publishing values of a configured set of data +# for consumption by Prometheus +# Must be disabled/enabled or a restart of the server to be active; for a pod disable/enable is used +# See https://docs.pingidentity.com/r/en-us/pingdirectory-92/pd_ds_monitor_server_metrics_prometheus + +dsconfig set-connection-handler-prop \ + --handler-name "HTTPS Connection Handler" \ + --add "http-servlet-extension:Prometheus Monitoring" \ + --set enabled:false + +dsconfig set-connection-handler-prop \ + --handler-name "HTTPS Connection Handler" \ + --set enabled:true \ No newline at end of file diff --git a/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig b/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig new file mode 100644 index 000000000..789b4454e --- /dev/null +++ b/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig @@ -0,0 +1,13 @@ +# Configure and enable the HTTP servlet extension for publishing values of a configured set of data +# for consumption by Prometheus +# Must be disabled/enabled or a restart of the server to be active; for a pod disable/enable is used +# See https://docs.pingidentity.com/r/en-us/pingdirectory-92/pd_ds_monitor_server_metrics_prometheus + +dsconfig set-connection-handler-prop \ + --handler-name "HTTPS Connection Handler" \ + --add "http-servlet-extension:Prometheus Monitoring" \ + --set enabled:false + +dsconfig set-connection-handler-prop \ + --handler-name "HTTPS Connection Handler" \ + --set enabled:true \ No newline at end of file From c954758b680d751b881f270f9f956eab2a1208eb Mon Sep 17 00:00:00 2001 From: PingDavidR Date: Wed, 27 Mar 2024 15:34:14 -0500 Subject: [PATCH 3/4] update doc link --- .../pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig index 789b4454e..5c44a2b5e 100644 --- a/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig +++ b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig @@ -1,7 +1,7 @@ # Configure and enable the HTTP servlet extension for publishing values of a configured set of data # for consumption by Prometheus # Must be disabled/enabled or a restart of the server to be active; for a pod disable/enable is used -# See https://docs.pingidentity.com/r/en-us/pingdirectory-92/pd_ds_monitor_server_metrics_prometheus +# See https://docs.pingidentity.com/r/en-us/pingauthorize-100/paz_monitor_server_metrics_prometheus dsconfig set-connection-handler-prop \ --handler-name "HTTPS Connection Handler" \ From f806cc6f497dfa2f2f1f9205340db691ab5e952e Mon Sep 17 00:00:00 2001 From: PingDavidR Date: Wed, 27 Mar 2024 15:50:52 -0500 Subject: [PATCH 4/4] tweak dsconfig --- .../pd.profile/dsconfig/15-prometheus.dsconfig | 6 ------ .../jolokia/pd.profile/dsconfig/15-prometheus.dsconfig | 6 ------ 2 files changed, 12 deletions(-) diff --git a/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig index 5c44a2b5e..11b5bfe24 100644 --- a/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig +++ b/monitoring/pingauthorize/pd.profile/dsconfig/15-prometheus.dsconfig @@ -1,13 +1,7 @@ # Configure and enable the HTTP servlet extension for publishing values of a configured set of data # for consumption by Prometheus -# Must be disabled/enabled or a restart of the server to be active; for a pod disable/enable is used # See https://docs.pingidentity.com/r/en-us/pingauthorize-100/paz_monitor_server_metrics_prometheus dsconfig set-connection-handler-prop \ --handler-name "HTTPS Connection Handler" \ --add "http-servlet-extension:Prometheus Monitoring" \ - --set enabled:false - -dsconfig set-connection-handler-prop \ - --handler-name "HTTPS Connection Handler" \ - --set enabled:true \ No newline at end of file diff --git a/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig b/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig index 789b4454e..7f67c7074 100644 --- a/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig +++ b/monitoring/pingdirectory/jolokia/pd.profile/dsconfig/15-prometheus.dsconfig @@ -1,13 +1,7 @@ # Configure and enable the HTTP servlet extension for publishing values of a configured set of data # for consumption by Prometheus -# Must be disabled/enabled or a restart of the server to be active; for a pod disable/enable is used # See https://docs.pingidentity.com/r/en-us/pingdirectory-92/pd_ds_monitor_server_metrics_prometheus dsconfig set-connection-handler-prop \ --handler-name "HTTPS Connection Handler" \ --add "http-servlet-extension:Prometheus Monitoring" \ - --set enabled:false - -dsconfig set-connection-handler-prop \ - --handler-name "HTTPS Connection Handler" \ - --set enabled:true \ No newline at end of file