Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to Prod #108

Merged
merged 13 commits into from
Sep 9, 2024
Merged

Merge to Prod #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fbc27fc
upgrade pingfederate to maintenance version 11.0.10
shahramsobhani Jul 10, 2024
1f2a7ca
Bump prometheus ver to 2.53.1
shahramsobhani Aug 9, 2024
156c02d
Merge pull request #106 from lsst-it/IT-5090-PingFederate-security-vu…
shahramsobhani Aug 9, 2024
4275dba
bump windows_exporter to 0.26.2
shahramsobhani Aug 9, 2024
eea51a0
bump prometheus::node_exporter to 1.8.2
shahramsobhani Aug 9, 2024
51ce2ba
bump blackbox exporter to 0.25.0
shahramsobhani Aug 9, 2024
3b6123f
bump alertmanager to 0.27.0
shahramsobhani Aug 9, 2024
d33b8e9
cycle windows_exporter service upon installation
shahramsobhani Aug 9, 2024
fa629e0
Bump Prometheus to 2.54.0
shahramsobhani Aug 12, 2024
5585777
bump grafana version to 11.1.4
shahramsobhani Aug 19, 2024
378b0d2
bump prometheus to ver 2.54.1
shahramsobhani Sep 9, 2024
55d1a44
bump grafana to ver 11.2.0
shahramsobhani Sep 9, 2024
eedaa8a
Merge pull request #107 from lsst-it/IT-5562-Bump-monitoring-systems-…
shahramsobhani Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/site/po/role/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions data/site/po/role/sso.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion site/profile/manifests/base_linux.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
5 changes: 3 additions & 2 deletions site/profile/manifests/base_windows.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion site/profile/manifests/grafana.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
) {
$grafana_pwd = lookup('grafana_pwd')
class { 'grafana':
version => '9.3.6',
version => '11.2.0',
provisioning_datasources => {
apiVersion => 1,
datasources => [
Expand Down
4 changes: 2 additions & 2 deletions site/profile/manifests/prometheus.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'],
Expand Down
4 changes: 2 additions & 2 deletions site/profile/manifests/sso.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
Loading