From 57c844b7e80b2bf4e124468bd05138bb64046c23 Mon Sep 17 00:00:00 2001 From: benvin Date: Sat, 6 Jun 2026 23:46:16 +1000 Subject: [PATCH] feat: upgrade grafana from default to 13.0.2 (#470) Pin grafana package version to 13.0.2 via a new version parameter on profiles::metrics::grafana, wired through to the puppet-grafana class. --------- Co-authored-by: Ben Vincent Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/470 --- hieradata/roles/infra/metrics/grafana.yaml | 1 + site/profiles/manifests/metrics/grafana.pp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hieradata/roles/infra/metrics/grafana.yaml b/hieradata/roles/infra/metrics/grafana.yaml index 27633de..0cabd9e 100644 --- a/hieradata/roles/infra/metrics/grafana.yaml +++ b/hieradata/roles/infra/metrics/grafana.yaml @@ -11,6 +11,7 @@ profiles::metrics::grafana::db_name: "%{hiera('profiles::sql::postgresdb::dbname profiles::metrics::grafana::db_user: "%{hiera('profiles::sql::postgresdb::dbuser')}" profiles::metrics::grafana::db_pass: "%{hiera('profiles::sql::postgresdb::dbpass')}" profiles::metrics::grafana::pgsql_backend: true +profiles::metrics::grafana::version: '13.0.2' profiles::metrics::grafana::plugins: victoriametrics-logs-datasource: ensure: present diff --git a/site/profiles/manifests/metrics/grafana.pp b/site/profiles/manifests/metrics/grafana.pp index a97163c..1af9530 100644 --- a/site/profiles/manifests/metrics/grafana.pp +++ b/site/profiles/manifests/metrics/grafana.pp @@ -1,6 +1,7 @@ # profiles::metrics::grafana class profiles::metrics::grafana ( String $ldap_bind_pass, + String $version = 'installed', Stdlib::Port $http_port = 8080, String $app_mode = 'production', Boolean $allow_sign_up = false, @@ -107,6 +108,7 @@ class profiles::metrics::grafana ( # deploy grafana class { 'grafana': + version => $version, cfg => $cfg, ldap_cfg => $ldap_cfg, plugins => $plugins,