Merge pull request #114 from lsst-it/main

shahramsobhani · web-flow · commit a3953a14f1e0 · 2025-01-27T15:03:52.000-07:00
merge to prod
diff --git a/data/node/NEPTUNE.lsst.local.yaml b/data/node/NEPTUNE.lsst.local.yaml
diff --git a/data/node/bellona.lsst.org.yaml b/data/node/bellona.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/data/node/hestia.lsst.local.yaml b/data/node/hestia.lsst.local.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - profile::default
diff --git a/data/node/jupiter.lsst.org.yaml b/data/node/jupiter.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/data/node/juventas.lsst.org.yaml b/data/node/juventas.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/data/node/lucina.lsst.org.yaml b/data/node/lucina.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/data/node/mars.lsst.org.yaml b/data/node/mars.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/data/node/minerva.lsst.org.yaml b/data/node/minerva.lsst.org.yaml
@@ -0,0 +1,4 @@
+---
+classes:
+  - profile::base_linux
+profile::base_linux::graylog: true
diff --git a/site/profile/manifests/graylog.pp b/site/profile/manifests/graylog.pp
@@ -75,10 +75,10 @@
     password_fail_reset => true,
   }
   class { 'graylog::repository':
-    version => '6.0',
+    version => '6.1',
   }
   ->class { 'graylog::server':
-    package_version => '6.0.3',
+    package_version => '6.1.3',
     config          => {
       is_leader                           => true,
       node_id_file                        => '/etc/graylog/server/node-id',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+classes:`
	`3`	`+ - profile::default`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@`
`75`	`75`	`password_fail_reset => true,`
`76`	`76`	`}`
`77`	`77`	`class { 'graylog::repository':`
`78`		`- version => '6.0',`
	`78`	`+ version => '6.1',`
`79`	`79`	`}`
`80`	`80`	`->class { 'graylog::server':`
`81`		`- package_version => '6.0.3',`
	`81`	`+ package_version => '6.1.3',`
`82`	`82`	`config => {`
`83`	`83`	`is_leader => true,`
`84`	`84`	`node_id_file => '/etc/graylog/server/node-id',`