From 82a1e39f5126cc7a77ee3ad55654f51e59263c23 Mon Sep 17 00:00:00 2001 From: Yogesh Sharma Date: Thu, 13 Aug 2020 10:59:23 -0700 Subject: [PATCH] Merge Development for 4.4-RC2 (#193) * exporter queries, prometheus config file and dashboards for container deployments (#188) * exporter queries, prometheus config file and dashboards * same dashboards. But exported from Grafana GUI * fix file permissions * add links and fix units on network panel * rename the 4 golden signals dashboard and add disk info to the saturation panel * change metric names from ccp_container to ccp_nodemx, update dashboards with new names, remove invalid panel links * rename queries_containers.yml to queries_nodemx.yml * fix the description of process count metric * exported dashboards to use externally * Container related updates to Prometheus Configs (#191) * Update Prometheus Job Name and Source Label The 'Crunchy Collect' container has been moved from the Crunchy Containers project to the Postgres Operator project and renamed to 'Crunchy Postgres Exporter'. This updates the Prometheus config file for container deployments to match the new container name. * Update queries_nodemx.yml File Comment Updates the comment beginning and ending comments from referring to 'pod_metrics.yml' to the current name, 'queries_nodemx.yml'. Co-authored-by: Pramodh Mereddy <36273111+pmereddy1@users.noreply.github.com> Co-authored-by: tjmoore4 <42497036+tjmoore4@users.noreply.github.com> --- exporter/postgres/queries_nodemx.yml | 4 ++-- prometheus/crunchy-prometheus.yml.containers | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exporter/postgres/queries_nodemx.yml b/exporter/postgres/queries_nodemx.yml index 548dcec4..0e6935dc 100644 --- a/exporter/postgres/queries_nodemx.yml +++ b/exporter/postgres/queries_nodemx.yml @@ -1,6 +1,6 @@ ### # -# Begin File: pod_metrics.yml +# Begin File: queries_nodemx.yml # ### ccp_nodemx_network: @@ -151,6 +151,6 @@ ccp_nodemx_data_disk: ### # -# End File: pod_metrics.yml +# End File: queries_nodemx.yml # ### diff --git a/prometheus/crunchy-prometheus.yml.containers b/prometheus/crunchy-prometheus.yml.containers index b6538943..3a6dac69 100644 --- a/prometheus/crunchy-prometheus.yml.containers +++ b/prometheus/crunchy-prometheus.yml.containers @@ -5,12 +5,12 @@ global: evaluation_interval: 5s scrape_configs: -- job_name: 'crunchy-collect' +- job_name: 'crunchy-postgres-exporter' kubernetes_sd_configs: - role: pod relabel_configs: - - source_labels: [__meta_kubernetes_pod_label_crunchy_collect] + - source_labels: [__meta_kubernetes_pod_label_crunchy_postgres_exporter] action: keep regex: true - source_labels: [__meta_kubernetes_pod_container_port_number]