From f543dedd3c978a551d3b8ec2fb1abcf9bbc1c28e Mon Sep 17 00:00:00 2001 From: mickogeary Date: Thu, 20 Jun 2024 12:45:16 +0100 Subject: [PATCH 1/2] minor doc updates from OSPRH-7722, OSP-32244, OSP-32175 --- ...r-director-operator-for-the-overcloud.adoc | 2 +- ...-the-stf-connection-for-the-overcloud.adoc | 2 +- ...uration-for-director-operator-for-stf.adoc | 15 +++++++--- ...eating-the-base-configuration-for-stf.adoc | 30 +++++++++++++------ 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-director-operator-for-the-overcloud.adoc b/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-director-operator-for-the-overcloud.adoc index f5017fb1..41c49502 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-director-operator-for-the-overcloud.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-director-operator-for-the-overcloud.adoc @@ -41,7 +41,7 @@ data: verifyHostname: false sslProfile: sslProfile saslUsername: guest@default-interconnect - saslPassword: pass: + saslPassword: MetricsQdrSSLProfiles: - name: sslProfile diff --git a/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc b/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc index 769fb11c..e3238836 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc @@ -43,7 +43,7 @@ parameter_defaults: verifyHostname: false sslProfile: sslProfile saslUsername: guest@default-interconnect - saslPassword: pass: + saslPassword: MetricsQdrSSLProfiles: - name: sslProfile diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc index 32284470..6b305124 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc @@ -54,8 +54,9 @@ data: CollectdConnectionType: amqp1 CollectdAmqpInterval: 30 CollectdDefaultPollingInterval: 30 - CollectdExtraPlugins: - - vmem + # to collect information about the virtual memory subsystem of the kernel + # CollectdExtraPlugins: + # - vmem # set standard prefixes for where metrics are published to QDR MetricsQdrAddresses: @@ -74,13 +75,16 @@ data: # note: this may need an adjustment if there are many metrics to be sent. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory - collectd::plugin::vmem::verbose: true + # receive extra information about virtual memory, can enable vmem plugin + # collectd::plugin::vmem::verbose: true # provide name and uuid in addition to hostname for better correlation # to ceilometer data collectd::plugin::virt::hostname_format: "name uuid hostname" + # to capture all extra_stats metrics, comment out below config + collectd::plugin::virt::extra_stats: cpu_util vcpu disk + # provide the human-friendly name of the virtual instance collectd::plugin:ConfigMap :virt::plugin_instance_format: metadata @@ -90,6 +94,9 @@ data: local: host: "%{hiera('fqdn_canonical')}" port: 11211 + + # report root filesystem storage metrics + collectd::plugin::df::ignoreselected: false ---- [role="_additional-resources"] diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc index 46a5299d..90c9dc92 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc @@ -35,9 +35,10 @@ parameter_defaults: CollectdConnectionType: amqp1 CollectdAmqpInterval: 30 CollectdDefaultPollingInterval: 30 - CollectdExtraPlugins: - - vmem - + # to collect information about the virtual memory subsystem of the kernel + # CollectdExtraPlugins: + # - vmem + # set standard prefixes for where metrics are published to QDR MetricsQdrAddresses: - prefix: 'collectd' @@ -55,8 +56,8 @@ parameter_defaults: # note: Adjust the value of the `send_queue_limit` to handle your required volume of metrics. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory - collectd::plugin::vmem::verbose: true + # receive extra information about virtual memory, can enable vmem plugin + # collectd::plugin::vmem::verbose: true # set memcached collectd plugin to report its metrics by hostname # rather than host IP, ensuring metrics in the dashboard remain uniform @@ -65,6 +66,9 @@ parameter_defaults: host: "%{hiera('fqdn_canonical')}" port: 11211 + # report root filesystem storage metrics + collectd::plugin::df::ignoreselected: false + # align defaults across OSP versions collectd::plugin::cpu::reportbycpu: true collectd::plugin::cpu::reportbystate: true @@ -105,8 +109,9 @@ parameter_defaults: CollectdConnectionType: amqp1 CollectdAmqpInterval: 30 CollectdDefaultPollingInterval: 30 - CollectdExtraPlugins: - - vmem + # to collect information about the virtual memory subsystem of the kernel + # CollectdExtraPlugins: + # - vmem # set standard prefixes for where metrics are published to QDR MetricsQdrAddresses: @@ -125,13 +130,16 @@ parameter_defaults: # note: this may need an adjustment if there are many metrics to be sent. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory - collectd::plugin::vmem::verbose: true + # receive extra information about virtual memory, can enable vmem plugin + # collectd::plugin::vmem::verbose: true # provide name and uuid in addition to hostname for better correlation # to ceilometer data collectd::plugin::virt::hostname_format: "name uuid hostname" + # to capture all extra_stats metrics, comment out below config + collectd::plugin::virt::extra_stats: cpu_util vcpu disk + # provide the human-friendly name of the virtual instance collectd::plugin::virt::plugin_instance_format: metadata @@ -141,5 +149,9 @@ parameter_defaults: local: host: "%{hiera('fqdn_canonical')}" port: 11211 + + # report root filesystem storage metrics + collectd::plugin::df::ignoreselected: false + ---- endif::include_when_16[] From 7764e820bc19e7bc3e328457fc231ada6c1d5ff6 Mon Sep 17 00:00:00 2001 From: mickogeary Date: Thu, 20 Jun 2024 15:49:28 +0100 Subject: [PATCH 2/2] to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins --- ...-the-base-configuration-for-director-operator-for-stf.adoc | 2 +- .../modules/proc_creating-the-base-configuration-for-stf.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc index 6b305124..b41a87f0 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc @@ -75,7 +75,7 @@ data: # note: this may need an adjustment if there are many metrics to be sent. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory, can enable vmem plugin + # to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins # collectd::plugin::vmem::verbose: true # provide name and uuid in addition to hostname for better correlation diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc index 90c9dc92..57d15360 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc @@ -56,7 +56,7 @@ parameter_defaults: # note: Adjust the value of the `send_queue_limit` to handle your required volume of metrics. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory, can enable vmem plugin + # to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins # collectd::plugin::vmem::verbose: true # set memcached collectd plugin to report its metrics by hostname @@ -130,7 +130,7 @@ parameter_defaults: # note: this may need an adjustment if there are many metrics to be sent. collectd::plugin::amqp1::send_queue_limit: 5000 - # receive extra information about virtual memory, can enable vmem plugin + # to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins # collectd::plugin::vmem::verbose: true # provide name and uuid in addition to hostname for better correlation