From d859c71e5038e2c65bbb99139dab648c6ef8ccd5 Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Wed, 1 Nov 2023 11:15:22 -0400 Subject: [PATCH 1/7] feature: update dependencies for node_exporter 1.5+ --- build/packages.yml | 2 +- changelogs/fragments/250.yml | 1 + changelogs/fragments/378.yml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/378.yml diff --git a/build/packages.yml b/build/packages.yml index a415b78..53d4488 100644 --- a/build/packages.yml +++ b/build/packages.yml @@ -47,7 +47,7 @@ packages: - { source: "node_exporter/linux/sysconfig.node_exporter", target: "/etc/sysconfig/node_exporter", mode: "0640", type: "file", rpm_new: true, owner: "ccp_monitoring", group: "ccp_monitoring" } - { target: "/var/lib/ccp_monitoring/node_exporter/", mode: "0700", type: "folder", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } pkg_dependency: - - { pkg_name: "node-exporter", gte: 1.4.0, lt: 1.5.0 } + - { pkg_name: "node-exporter", gte: 1.5.0, lt: 1.7.0 } remove_files: - { target: "/etc/systemd/system/node_exporter.service.d/crunchy-node-exporter-service-el7.conf" } upstream_repo: "https://github.com/CrunchyData/pgmonitor" diff --git a/changelogs/fragments/250.yml b/changelogs/fragments/250.yml index bbbe999..9209053 100644 --- a/changelogs/fragments/250.yml +++ b/changelogs/fragments/250.yml @@ -1,3 +1,4 @@ +--- major_changes: - grafana - add Alertmanager datasource to Grafana to allow direct alert management via Grafana - grafana - update 'Prometheus Alerts' dashboard to include new alert panel interface for active alerts diff --git a/changelogs/fragments/378.yml b/changelogs/fragments/378.yml new file mode 100644 index 0000000..5c26ec3 --- /dev/null +++ b/changelogs/fragments/378.yml @@ -0,0 +1,3 @@ +--- +trivial: + - node_exporter - update build dependencies for node-exporter-extras package From b70cafe9ca11ac9e318825f3837ed936c40793ac Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Wed, 1 Nov 2023 17:02:24 -0400 Subject: [PATCH 2/7] feat: update build dependencies for other monitoring packages --- build/packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/packages.yml b/build/packages.yml index 53d4488..478593f 100644 --- a/build/packages.yml +++ b/build/packages.yml @@ -58,7 +58,7 @@ packages: - { source: "postgres_exporter/linux/pgbackrest-info.sh", target: "/usr/bin/pgbackrest-info.sh", mode: "0755", type: "file", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } - { source: "postgres_exporter/linux/pgmonitor.conf", target: "/etc/pgmonitor.conf", mode: "0644", type: "file", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } pkg_dependency: - - { pkg_name: "postgres-exporter", gte: 0.10.1, lt: 0.12.0 } + - { pkg_name: "postgres-exporter", gte: 0.13.2, lt: 0.16.0 } upstream_repo: "https://github.com/CrunchyData/pgmonitor" - pgmonitor-prometheus-extras: @@ -77,7 +77,7 @@ packages: pkg_conflict: - { pkg_name: "pgmonitor-prometheus-containers" } pkg_dependency: - - { pkg_name: "prometheus2", gte: 2.38.0 , lt: 2.40.0 } + - { pkg_name: "prometheus2", gte: 2.38.0 , lt: 2.48.0 } remove_files: - { target: "/etc/systemd/system/prometheus.service.d/crunchy-prometheus-service-el7.conf" } upstream_repo: "https://github.com/CrunchyData/pgmonitor" @@ -89,7 +89,7 @@ packages: - { source: "/etc/systemd/system/sysconfig.alertmanager", target: "/etc/sysconfig/alertmanager", mode: "0640", type: "file", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } - { target: "/var/lib/ccp_monitoring/prometheus", mode: "0750", type: "folder", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } pkg_dependency: - - { pkg_name: "alertmanager", gte: 0.23.0, lt: 0.25.0 } + - { pkg_name: "alertmanager", gte: 0.23.0, lt: 0.27.0 } remove_files: - { target: "/etc/systemd/system/alertmanager.service.d/crunchy-alertmanager-service-el7.conf" } upstream_repo: "https://github.com/CrunchyData/pgmonitor" @@ -103,7 +103,7 @@ packages: pkg_conflict: - { pkg_name: "grafana-containers" } pkg_dependency: - - { pkg_name: "grafana", gte: 9.2.19, lt: 9.3.0 } + - { pkg_name: "grafana", gte: 9.5.13, lt: 10.0.0 } upstream_repo: "https://github.com/CrunchyData/pgmonitor" - pg_bloat_check: From 800c89277b481f39eea3d58bd62f5f21d86a15e1 Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Wed, 1 Nov 2023 17:09:32 -0400 Subject: [PATCH 3/7] chore: update changelog fragment --- changelogs/fragments/378.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelogs/fragments/378.yml b/changelogs/fragments/378.yml index 5c26ec3..e71489f 100644 --- a/changelogs/fragments/378.yml +++ b/changelogs/fragments/378.yml @@ -1,3 +1,7 @@ --- trivial: - node_exporter - update build dependencies for node-exporter-extras package + - postgres_exporter - minimum version 0.13.2, maximum 0.15 + - prometheus - minimum version 2.38, maximum 2.47 + - alertmanager - minimum version 0.23, maximum 0.26 + - grafana - minimum version 9.5, maximum 9.5 From 406e3d0022f9f8f279dd44277a2ab950a2db2d56 Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Thu, 2 Nov 2023 12:34:07 -0400 Subject: [PATCH 4/7] Apply suggestions from code review Co-authored-by: Douglas J Hunley --- changelogs/fragments/378.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/changelogs/fragments/378.yml b/changelogs/fragments/378.yml index e71489f..44a52f7 100644 --- a/changelogs/fragments/378.yml +++ b/changelogs/fragments/378.yml @@ -1,7 +1,8 @@ --- -trivial: - - node_exporter - update build dependencies for node-exporter-extras package - - postgres_exporter - minimum version 0.13.2, maximum 0.15 - - prometheus - minimum version 2.38, maximum 2.47 - - alertmanager - minimum version 0.23, maximum 0.26 - - grafana - minimum version 9.5, maximum 9.5 +minor_changes: + - node_exporter - minimum version 1.5.0, maximum 1.6.x +minor_changes: + - postgres_exporter - minimum version 0.13.2, maximum 0.15.x + - prometheus - minimum version 2.38, maximum 2.47.x + - alertmanager - minimum version 0.23, maximum 0.26.x + - grafana - minimum version 9.5, maximum 9.9.x From 2f1c1294f5fc7255d213aaa4035ece6e531d45f2 Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Thu, 2 Nov 2023 12:35:03 -0400 Subject: [PATCH 5/7] chore: fix changelog fragment --- changelogs/fragments/378.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/changelogs/fragments/378.yml b/changelogs/fragments/378.yml index 44a52f7..be13ca1 100644 --- a/changelogs/fragments/378.yml +++ b/changelogs/fragments/378.yml @@ -1,7 +1,6 @@ --- minor_changes: - node_exporter - minimum version 1.5.0, maximum 1.6.x -minor_changes: - postgres_exporter - minimum version 0.13.2, maximum 0.15.x - prometheus - minimum version 2.38, maximum 2.47.x - alertmanager - minimum version 0.23, maximum 0.26.x From d142a58c2a23d79454150a3f46d00c230209d5fa Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Fri, 3 Nov 2023 15:22:38 -0400 Subject: [PATCH 6/7] feat: allow older versions of pg exporter and grafana for now --- build/packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/packages.yml b/build/packages.yml index 478593f..5a49b33 100644 --- a/build/packages.yml +++ b/build/packages.yml @@ -58,7 +58,7 @@ packages: - { source: "postgres_exporter/linux/pgbackrest-info.sh", target: "/usr/bin/pgbackrest-info.sh", mode: "0755", type: "file", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } - { source: "postgres_exporter/linux/pgmonitor.conf", target: "/etc/pgmonitor.conf", mode: "0644", type: "file", rpm_new: false, owner: "ccp_monitoring", group: "ccp_monitoring" } pkg_dependency: - - { pkg_name: "postgres-exporter", gte: 0.13.2, lt: 0.16.0 } + - { pkg_name: "postgres-exporter", gte: 0.10.1, lt: 0.16.0 } upstream_repo: "https://github.com/CrunchyData/pgmonitor" - pgmonitor-prometheus-extras: @@ -103,7 +103,7 @@ packages: pkg_conflict: - { pkg_name: "grafana-containers" } pkg_dependency: - - { pkg_name: "grafana", gte: 9.5.13, lt: 10.0.0 } + - { pkg_name: "grafana", gte: 9.2.19, lt: 10.0.0 } upstream_repo: "https://github.com/CrunchyData/pgmonitor" - pg_bloat_check: From 182f03f25a1e48a60b1844f013184e533567e58f Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Fri, 3 Nov 2023 15:24:26 -0400 Subject: [PATCH 7/7] chore: update changelog --- changelogs/fragments/378.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelogs/fragments/378.yml b/changelogs/fragments/378.yml index be13ca1..b64e1b9 100644 --- a/changelogs/fragments/378.yml +++ b/changelogs/fragments/378.yml @@ -1,7 +1,7 @@ --- minor_changes: - node_exporter - minimum version 1.5.0, maximum 1.6.x - - postgres_exporter - minimum version 0.13.2, maximum 0.15.x + - postgres_exporter - minimum version 0.10.1, maximum 0.15.x - prometheus - minimum version 2.38, maximum 2.47.x - alertmanager - minimum version 0.23, maximum 0.26.x - - grafana - minimum version 9.5, maximum 9.9.x + - grafana - minimum version 9.2.19, maximum 9.9.x