Skip to content

Commit 2dedeeb

Browse files
shahramsobhanishahramsobhani
authored
Merge pull request #122 from lsst-it/main
Merge to Prod
2 parents a3953a1 + ab2e0a1 commit 2dedeeb

File tree

9 files changed

+50
-11
lines changed

9 files changed

+50
-11
lines changed

‎data/node/mr-tuc-1.lsst.org.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
classes:
33
- profile::base_linux
44
- profile::prometheus
5-
profile::prometheus::slackuser_hide: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPkerONs2xIYI2wuDbCEfqU6nZME6rHgOJiKXkhTY+k4FT4EDPC9x+51cZ1inYmkxyHp3B3v+mOapVh/rTeR43eSXMuSvsGfFmz1Sr3fV9ypmLQ1S7VtAnUqNRn8lpRWjt4/PbgAoRRhzz9kgSVr6C7jpEOeWHMz9RWeru81wm92YOjvzjhAFdqosRXbk5qF09fppArZ7AwJ0ivAM+xhKKbl/qF9fomQS68XKMgI/ewdqQmesMqG7hKqUBpUOcF6dMijLbihq8T6P2JbUV7O9TvNb1XreMqfNAeVbvlwSoPuVmmDwD4QLyVX6Wobnp0D9AHMVUi0hTjvAbuqcxAM45TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCpH8eZpnkaGO/ACoECJ5KgCB9SV+bchN4GeyPFcYSFTw4kte21Tx+62TYxtV46CIFlA==]
6-
profile::prometheus::slackapi_hide: ENC[PKCS7,MIIBuQYJKoZIhvcNAQcDoIIBqjCCAaYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVeRiDIioUKNOrDQuzoi3JPDTs0xLE3cvivudtlZd9Ksfh/hJFKOQ89a5a8aB9priDEXtHV36G9X/6FJ/FLvhM/xvtvyeBrVMJ7b3uTJRNvCnBTlexkKUX36yDFJBqiyQAebeaLNrTrURUDum0PK8vi5V3a6+vLkCHz4cxWisDFbkdxYDI4NTJ1HFg3eHED5RyFLTd2lf1y3jFSAhu1vn6Nmq85Pqy0SXzSHehDls+SLkimaUwfWn4oujVfm7TU29xIinAQ7bgmAk+UuuKtxGYsmNvdsNRy0LX+H9Mm23UgfpcyuRJZaqyWEuHdtZ035aOnYBqTvWUYgcmv1d1LNZpjB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBoP2c/stbffP1wOOZV9mfNgFDEviEzDQoK35MZhA9NCYoZY7m9sZ73fzDnnk9PraNNnZaW5J0lfiyMAzDeFyZQEqkQ/R9da5Ow1zR7+oiDLaTm0Pgmxc4nEWVatOhHKZE0RQ==]
75
profile::prometheus::cluster_hide: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGzQnF2ZbDmEDg5xwlMxs4XW8s1YhqSRpFQ0I18SUQQ63umULQBNUb+BwVxYBiQ96fhw44At9oup9GgSZ3MnDShP2ALNHydWMpwsddMId54/J9rkXMGeEAaq9dd7A0Xb2q+pVXZYQWQ+map7pKL00TxiSiOo3KXrGYe1972dXjssYyS5JvCokvHodm1aBzcezZyi1oD6QUjeAWiQd139Ul5yQH22PNx+MfE3qp8uWw4ueLu005j2+k4zE1eOz87Gxf+0NTEJkeWvVmrwdIGJb4uzXOObEMDGrz2itRYCMYZwFsJfA9Rry4rirRbVjg3e5mPxMk7SYdvZWJVVMvVPGgjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBsrTaPdZGuo0p2ZKvDmDa1gCBWITTDyO8Gr/tFlkmrJcFIBIdjfVGui26qS0BYtC6PkA==]
86
profile::prometheus::advertise_ip: 192.168.50.11:9093
97
# Network config

‎data/node/mr-tuc-2.lsst.org.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
classes:
33
- profile::base_linux
44
- profile::prometheus
5-
profile::prometheus::slackuser_hide: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPkerONs2xIYI2wuDbCEfqU6nZME6rHgOJiKXkhTY+k4FT4EDPC9x+51cZ1inYmkxyHp3B3v+mOapVh/rTeR43eSXMuSvsGfFmz1Sr3fV9ypmLQ1S7VtAnUqNRn8lpRWjt4/PbgAoRRhzz9kgSVr6C7jpEOeWHMz9RWeru81wm92YOjvzjhAFdqosRXbk5qF09fppArZ7AwJ0ivAM+xhKKbl/qF9fomQS68XKMgI/ewdqQmesMqG7hKqUBpUOcF6dMijLbihq8T6P2JbUV7O9TvNb1XreMqfNAeVbvlwSoPuVmmDwD4QLyVX6Wobnp0D9AHMVUi0hTjvAbuqcxAM45TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCpH8eZpnkaGO/ACoECJ5KgCB9SV+bchN4GeyPFcYSFTw4kte21Tx+62TYxtV46CIFlA==]
6-
profile::prometheus::slackapi_hide: ENC[PKCS7,MIIBuQYJKoZIhvcNAQcDoIIBqjCCAaYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVeRiDIioUKNOrDQuzoi3JPDTs0xLE3cvivudtlZd9Ksfh/hJFKOQ89a5a8aB9priDEXtHV36G9X/6FJ/FLvhM/xvtvyeBrVMJ7b3uTJRNvCnBTlexkKUX36yDFJBqiyQAebeaLNrTrURUDum0PK8vi5V3a6+vLkCHz4cxWisDFbkdxYDI4NTJ1HFg3eHED5RyFLTd2lf1y3jFSAhu1vn6Nmq85Pqy0SXzSHehDls+SLkimaUwfWn4oujVfm7TU29xIinAQ7bgmAk+UuuKtxGYsmNvdsNRy0LX+H9Mm23UgfpcyuRJZaqyWEuHdtZ035aOnYBqTvWUYgcmv1d1LNZpjB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBoP2c/stbffP1wOOZV9mfNgFDEviEzDQoK35MZhA9NCYoZY7m9sZ73fzDnnk9PraNNnZaW5J0lfiyMAzDeFyZQEqkQ/R9da5Ow1zR7+oiDLaTm0Pgmxc4nEWVatOhHKZE0RQ==]
75
profile::prometheus::cluster_hide: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbio7LJxB92I8J1SRY2QT6JnIRya1Rwiu95tiRxORlkMcZKlK8UnWMxcSfc9fahsvWqEpb8oJOItnuoxM3Q5RyuRUy4diZUg6lIk65Ovjd4IMAYwPfBpFhyvEpBerzeZHOFP1neDepO8j2ELoGmrbuhtYJMIZ6xu5+5OI6JlBmM00lnScIZWstBcg4Y7jRD+DiRbD7E+QPn7bJTtQISmQH1sh/wgcohn7vvJDvKldao/of8mZc+Q8unXnziYGeqmnHckQFwQPj5SycnXEao/Ymi6yR3klzWwfDW4Fs4ZeWbHiqiKNrf2Edsfx8L8QTCdFe+oDhj0EGm+McoKdg387cDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBuBFkSWbLCr+zUu0/03hoQgCAi305bSze4b7B4pyx4jY74GPAXIWM/PCJnmzYbkltyig==]
86
profile::prometheus::advertise_ip: 192.168.50.12:9093
97
# Network config

‎data/node/web-tuc-1.lsst.org.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
classes:
3+
- profile::base_linux
4+
profile::base_linux::network: true
5+
profile::base_linux::graylog: true
6+
network_config:
7+
eth0:
8+
name: eth0
9+
ensure: present
10+
ipaddress: 140.252.201.29
11+
netmask: 255.255.255.0
12+
method: static
13+
onboot: true
14+
options:
15+
GATEWAY: 140.252.201.1
16+
DNS1: 140.252.32.125
17+
DNS2: 140.252.32.126
18+
DNS3: 140.252.32.127

‎data/site/po/role/prometheus.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ profile::base_linux::network: true
44
prometheus::alertmanager::template:
55
- '/alertmanager/notifications.tmpl'
66
prometheus::manage_prometheus_server: true
7-
prometheus::version: '2.54.1'
7+
prometheus::version: '3.4.0'
88
prometheus::storage_retention: '30d'
9+
profile::prometheus::slackuser_hide: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPkerONs2xIYI2wuDbCEfqU6nZME6rHgOJiKXkhTY+k4FT4EDPC9x+51cZ1inYmkxyHp3B3v+mOapVh/rTeR43eSXMuSvsGfFmz1Sr3fV9ypmLQ1S7VtAnUqNRn8lpRWjt4/PbgAoRRhzz9kgSVr6C7jpEOeWHMz9RWeru81wm92YOjvzjhAFdqosRXbk5qF09fppArZ7AwJ0ivAM+xhKKbl/qF9fomQS68XKMgI/ewdqQmesMqG7hKqUBpUOcF6dMijLbihq8T6P2JbUV7O9TvNb1XreMqfNAeVbvlwSoPuVmmDwD4QLyVX6Wobnp0D9AHMVUi0hTjvAbuqcxAM45TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCpH8eZpnkaGO/ACoECJ5KgCB9SV+bchN4GeyPFcYSFTw4kte21Tx+62TYxtV46CIFlA==]
10+
profile::prometheus::slackapi_hide: ENC[PKCS7,MIIBuQYJKoZIhvcNAQcDoIIBqjCCAaYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYzFhtkzDrapPPEHuStqNy1L4VtoBrQg/ZItZefD4MmueoH9lqYkafvncsS/FULrwQJ+bchRUOqzufihvXSU+5kuyzYgx3PhoCpIiGwssrezybnwscmtKSFawGQaaLqDbRbmXSx1ECeYOYhKFWhZ9cpUp/kcUTA0F0kx6Mt3fdnzCLTKuUcDIPVqIBTLCvU+q5Kv0H3Zvw3OqT41NiHikJb9NKz8CObA5kADiRrrhdMqtDX9zHSTEqhxsKZxKtrF7Nt2yXIBd3GQysGX/rIoHiu97L051MgNiDU5WK+XZna70DnzxpMhGGfAfyTHVt5MiTzVdQfFTe+Z0RmALuXAn5zB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAr8OiyVidjQmhdpjGQ6E2NgFCqUEKGfDL5uDQea22tctUArdN3+KbTRXwy/s4wljy2FF011aoVgpXc50yPnRsOF8ngVtEHu7Bs/TtPquAqBWa+8os6unle9ontoMdCNi+OXw==]
911
prometheus::alerts:
1012
groups:
1113
- name: 'alert.rules'

‎site/profile/manifests/base_linux.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434
# config: /etc/systemd/system/node_exporter.service
3535
class { 'prometheus::node_exporter':
36-
version => '1.8.2',
36+
version => '1.9.1',
3737
extra_options => '--collector.systemd \--collector.processes \--collector.meminfo_numa',
3838
}
3939
class { 'chrony':

‎site/profile/manifests/grafana.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
) {
1616
$grafana_pwd = lookup('grafana_pwd')
1717
class { 'grafana':
18-
version => '11.2.0',
18+
version => '11.5.2',
1919
provisioning_datasources => {
2020
apiVersion => 1,
2121
datasources => [

‎site/profile/manifests/graylog.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
password_fail_reset => true,
7676
}
7777
class { 'graylog::repository':
78-
version => '6.1',
78+
version => '6.2',
7979
}
8080
->class { 'graylog::server':
81-
package_version => '6.1.3',
81+
package_version => '6.2.2',
8282
config => {
8383
is_leader => true,
8484
node_id_file => '/etc/graylog/server/node-id',

‎site/profile/manifests/prometheus.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
content => epp('profile/alertmanager_custom.epp'),
2222
}
2323
class { 'prometheus::blackbox_exporter':
24-
version => '0.25.0',
24+
version => '0.26.0',
2525
modules => {
2626
'http_2xx' => {
2727
'prober' => 'http',
@@ -42,7 +42,7 @@
4242
}
4343
# Alertmanager config
4444
class { 'prometheus::alertmanager':
45-
version => '0.27.0',
45+
version => '0.28.1',
4646
extra_options => "--cluster.advertise-address=${advertise_ip} \--cluster.listen-address=:9797 \--cluster.peer=${unwrap($cluster_hide)}",
4747
route => {
4848
'group_by' => ['job'],

‎site/profile/manifests/sso.pp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,27 @@
9292
ensure => 'running',
9393
enable => true,
9494
}
95+
# Downloads the duo connector
96+
archive { '/tmp/duopingfederate.zip':
97+
source => 'http://wsus.lsst.org/puppetfiles/pingfederate/duopingfederate.zip',
98+
cleanup => false,
99+
extract => true,
100+
extract_path => '/tmp/',
101+
}
102+
file { "/opt/pingfederate-${pf_version}/pingfederate/server/default/deploy/pf-duo-security-adapter-3.1.2.jar":
103+
ensure => present,
104+
source => '/tmp/pingfederate/server/default/deploy/pf-duo-security-adapter-3.1.2.jar',
105+
mode => '0775',
106+
# dir_mode => '0775',
107+
owner => $pf_user,
108+
group => $pf_user,
109+
}
110+
file { "/opt/pingfederate-${pf_version}/pingfederate/server/default/lib/pf-authn-api-sdk-1.0.0.81.jar":
111+
ensure => present,
112+
source => '/tmp/pingfederate/server/default/lib/pf-authn-api-sdk-1.0.0.81.jar',
113+
mode => '0775',
114+
# dir_mode => '0775',
115+
owner => $pf_user,
116+
group => $pf_user,
117+
}
95118
}

0 commit comments

Comments
 (0)