Skip to content

Commit

Permalink
feature: update dependencies for monitoring services (#379)
Browse files Browse the repository at this point in the history
* feature: update dependencies for node_exporter 1.5+

* feat: update build dependencies for other monitoring packages

* chore: update changelog fragment

* Apply suggestions from code review

Co-authored-by: Douglas J Hunley <doug.hunley@gmail.com>

* chore: fix changelog fragment

* feat: allow older versions of pg exporter and grafana for now

* chore: update changelog

---------

Co-authored-by: Douglas J Hunley <doug.hunley@gmail.com>
  • Loading branch information
keithf4 and hunleyd authored Nov 8, 2023
1 parent 476d3be commit 1350b23
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.10.1, lt: 0.16.0 }
upstream_repo: "https://github.com/CrunchyData/pgmonitor"

- pgmonitor-prometheus-extras:
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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.2.19, lt: 10.0.0 }
upstream_repo: "https://github.com/CrunchyData/pgmonitor"

- pg_bloat_check:
Expand Down
1 change: 1 addition & 0 deletions changelogs/fragments/250.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions changelogs/fragments/378.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
minor_changes:
- node_exporter - minimum version 1.5.0, maximum 1.6.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.2.19, maximum 9.9.x

0 comments on commit 1350b23

Please sign in to comment.