Merge pull request #108 from lsst-it/main

Merge to Prod
lsst-it · Sep 9, 2024 · 1d452b6 · 1d452b6
2 parents a7a14a7 + eedaa8a
commit 1d452b6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/data/site/po/role/prometheus.yaml b/data/site/po/role/prometheus.yaml
@@ -4,7 +4,7 @@ profile::base_linux::network: true
 prometheus::alertmanager::template:
   - '/alertmanager/notifications.tmpl'
 prometheus::manage_prometheus_server: true
-prometheus::version: '2.41.0'
+prometheus::version: '2.54.1'
 prometheus::storage_retention: '30d'
 prometheus::alerts:
   groups:

diff --git a/data/site/po/role/sso.yaml b/data/site/po/role/sso.yaml
@@ -13,9 +13,9 @@ profile::base_linux::awscli: true
 profile::base_linux::postfix: true
 profile::base_linux::graylog: true
 profile::sso::pf_user_hide: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALeU/IXAFtUUHXKMaKgkXgRbx9eDBmn86qet35pNVWiylbkIcwjDrZe6GW1IUu4FOHY1ZYE4Bcd8pIHRW7oSWDmhjnICGfikXADlYnVxfBLG84MpNrnw1eBylpY4xibmEIpEr5rqtrTlmNo6yPVZYeuB83taoGnPvCRnFlKpGr0TwNTS4IMKnv3CbjswZhr9VCryA5r2HMk6VqIN0sbSjj1w3HotYeEHPXhd8cksm0SdPkpnqUUgILK4GTPSpLQn3sUKIef3DW1fookyllBLShx9tbNUmusehrDkTebgPOjjIid3b4G4ygCPAIIOaoJf3hYayd+U/Og4FXPLxKIZ1ajA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAEjbZdo5vaUnuqvAhpSFnDgBD/Z+L4zu/ZCfezJ4PoN3m/]
-profile::sso::pf_version: '11.0.7'
+profile::sso::pf_version: '11.0.10'
 profile::sso::java_home: '/usr/java/jdk-11.0.2+9-jre' #'/usr/java/jdk-11.0.2+9'
-profile::sso::pf_home: '/opt/pingfederate-11.0.7/pingfederate'
+profile::sso::pf_home: '/opt/pingfederate-11.0.10/pingfederate'
 profile::java::version: 'latest'
 profile::java::distribution: 'jre'
 profile::java::java_home: '/usr/java/jdk-11.0.2+9-jre' #'/usr/java/jdk-11.0.2+9'

diff --git a/site/profile/manifests/base_linux.pp b/site/profile/manifests/base_linux.pp
@@ -33,7 +33,7 @@
   }
 # config: /etc/systemd/system/node_exporter.service
   class { 'prometheus::node_exporter':
-    version       => '1.5.0',
+    version       => '1.8.2',
     extra_options => '--collector.systemd \--collector.processes \--collector.meminfo_numa',
   }
   class { 'chrony':

diff --git a/site/profile/manifests/base_windows.pp b/site/profile/manifests/base_windows.pp
@@ -6,8 +6,9 @@
 ) {
   include chocolatey # Needed for just about most things for Windows.
   package { 'windows_exporter':
-    ensure => '0.19.0',
-    source => 'https://github.com/prometheus-community/windows_exporter/releases/download/v0.19.0/windows_exporter-0.19.0-amd64.msi',
+    ensure => '0.26.2',
+    source => 'https://github.com/prometheus-community/windows_exporter/releases/download/v0.26.2/windows_exporter-0.26.2-amd64.msi',
+    notify => Service['windows_exporter'],
   }
   # Start service if it has stopped or crashed.
   service { 'windows_exporter':

diff --git a/site/profile/manifests/grafana.pp b/site/profile/manifests/grafana.pp
@@ -15,7 +15,7 @@
 ) {
   $grafana_pwd = lookup('grafana_pwd')
   class { 'grafana':
-    version                  => '9.3.6',
+    version                  => '11.2.0',
     provisioning_datasources => {
       apiVersion  => 1,
       datasources => [

diff --git a/site/profile/manifests/prometheus.pp b/site/profile/manifests/prometheus.pp
@@ -21,7 +21,7 @@
     content => epp('profile/alertmanager_custom.epp'),
   }
   class { 'prometheus::blackbox_exporter':
-    version => '0.23.0',
+    version => '0.25.0',
     modules => {
       'http_2xx'    => {
         'prober'  => 'http',
@@ -42,7 +42,7 @@
   }
 # Alertmanager config
   class { 'prometheus::alertmanager':
-    version       => '0.25.0',
+    version       => '0.27.0',
     extra_options => "--cluster.advertise-address=${advertise_ip} \--cluster.listen-address=:9797 \--cluster.peer=${unwrap($cluster_hide)}",
     route         => {
       'group_by'        => ['job'],

diff --git a/site/profile/manifests/sso.pp b/site/profile/manifests/sso.pp
@@ -21,8 +21,8 @@
       extract      => true,
       extract_path => '/tmp/',
     }
-    # zoom provisioner /opt/pingfederate-11.0.7/pingfederate/server/default/deploy/
-    archive { '/opt/pingfederate-11.0.7/pingfederate/server/default/deploy/pf-zoom-quickconnection-1.0.jar':
+    # zoom provisioner /opt/pingfederate-${pf_version}/pingfederate/server/default/deploy/
+    archive { "/opt/pingfederate-${pf_version}/pingfederate/server/default/deploy/pf-zoom-quickconnection-1.0.jar":
       source   => 'http://wsus.lsst.org/puppetfiles/pingfederate/pf-zoom-quickconnection-1.0.jar',
       cleanup  => false,
     }