fix general things

diff --git a/Jenkinsfile b/Jenkinsfile
index 9a60f5887c8b30e58a74cc0cbdd46bc60a5e0d4b..d2b8962cdb13e1df431678c5f3ef1c723cd6cda2 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,6 @@ stage('Yaml-Linter') {
     git credentialsId: 'd1d6ad59-8d5a-45b4-acfb-64a36d7fd8cd', url: 'git@git.pixelpark.com:puppet/hiera.git', branch: "${BRANCH_NAME}"
     sh '/bin/yum install -y python-pip'
     sh 'pip install yamllint'
-    sh 'bash -c "LANG=C.UTF-8 /usr/bin/yamllint -c yamllint.config ."'
+    sh 'bash -c "LANG=C.UTF-8 /usr/bin/yamllint -c yamllint.yaml ."'
   }
 }

diff --git a/classes/infra::profile::logstash::mysql.yaml b/classes/infra::profile::logstash::mysql.yaml
index bb66dbf921f0ea1e2b9ac0562ec9cf49e202eacc..95fbac03151abfd367393483f189b4b65a937aea 100644 (file)
--- a/classes/infra::profile::logstash::mysql.yaml
+++ b/classes/infra::profile::logstash::mysql.yaml
@@ -4,7 +4,7 @@ infra::profile::logstash::mysql::resources:
     resource: file
     order: 10  # Input
     parameters:
-      path: 
+      path:
         - '/var/log/mariadb/mariadb.log'
         - '/var/log/mariadb/mysql.log'
         - '/var/log/mariadb/error.log'
@@ -30,4 +30,4 @@ infra::profile::logstash::mysql::resources:
         - message
         - '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:restmessage}'
 
-# TODO: Fuer aeltere Logs: https://sh.lrn2.co.uk/processing-mysql-mariadb-galera-logs-for-logstash/
\ No newline at end of file
+# TODO: Fuer aeltere Logs: https://sh.lrn2.co.uk/processing-mysql-mariadb-galera-logs-for-logstash/

diff --git a/common.yaml b/common.yaml
index 94027316de0d842a10bf081251c0dcc79f1b6db4..bdb456f3865f9c1a60281e481fbf8e3b75cacd48 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -83,7 +83,7 @@ infra::profile::snmp::users_v3:
         pk2qYjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4PNzmtzGXz2aZZA2j
         GV4VgCDOHIJxE3typXCEWMpznzD0Zae/XN4MkiDK0+Z3U4MHSw==]
 snmp::snmpd_config:
- - 'rwuser pixelpark authPriv'
+  - 'rwuser pixelpark authPriv'
 
 
 #####################################################
@@ -301,6 +301,7 @@ accounts::users:
     uid: 24732
     key: "AAAAB3NzaC1yc2EAAAABJQAAAQBMyQXr2Jo7aXVebw0oZ01bOkrD2Xr9l7Hmjq3BJfa4Fuci4NJZKwOcrAokwb3lF3oRcIVG8c/S/B3gJdCzsQGaZ2MBbdNQKAJKPj+BFJGnbJZXPHOe2zSEnnlgIfecu1qbOKrwBz+8BkHDDzpzb7g9a5Pr6X54bkcSa1B/9oFtHEKxziptlnF68MqDYeODDz5cBIg1u5qDY9fuluJZGJzE9WG+uH+P5Av+64W3Gytnd6wZb88y2VOzuAWX3/fyz8X+KbXCxotPVvUxLn2Vn1+BvDdrfGI8tfFUCDjGJVR1A72YCQy84fRQMntwvlNhdQfFbweIwxexZZr6M3QgKbu/"
     comment: "Stephan-Vits"
+    apply: false
   harry.teuber:
     uid: 24210
     key: "AAAAB3NzaC1yc2EAAAABIwAAAQEAvM1IwEz8DH5Doi67hro3wcqIW0/iXj+zQ3Td4Hx5GH4RSWa+6H/76hltbG47wFhNJ/8PkuPoJZ9wU37KkWYMvNtyJALva6N8VtHbxGPa5htODzdq0JTC1dV30YOcKXQ6P6erKAtT8vszH8KY56yhKdzCPuQNujZl9WQVUpgQG80spL51X2K4E2y6cClGKfXMG4Nry0A0GcfY97+9dRierOfvgB1plTSdxO0BK9X9vRdrxPCyy5V2i1RUWepqdh2fZAOZoDXyeKD2i0Lvj5bKDZZ7Si17ClTlNVyZv4wvIHx3SzaNECLwYDjk6+xbbX7RiIG/cMCh4DVmgO25CW1GyQ=="
@@ -1132,11 +1133,6 @@ accounts::users:
     key: "AAAAB3NzaC1yc2EAAAABIwAAAQEA6YGpoxwTik/mjZkBHx8zcFk8mib5KkYHGssKKJCEtT+XgUOLNumC5mzEaX0VRVWTp1hiZq6BunpMu6BagLvBp0SLKj28b3HQrsN8l8TV9i3tzIwkDfJO3TREg4nQp7cysry3yZpVpJ6P1ZZ5jAfAdO1MHUku05yVV9WlKoU7rBhiyJq241No6rl5/d/Et7vrEmRHHHYujxovSr0BfJ42+8B2ZpGKG/w4MmyAQGyjas+cPXYgcerWxo2s/dP0sQTmhoNDJOR8kqfLGOC1O8HEhNrIVQCWjE6WoRUUx7n6Ymi0rfMAlBeZ41P7ystx7ctEyna+HHV9YThIHKIbDsuBYw=="
     comment: "Hooman-Paknahad"
     apply: false
-  stephan.vits:
-    uid: 24732
-    key: "AAAAB3NzaC1yc2EAAAABJQAAAQBMyQXr2Jo7aXVebw0oZ01bOkrD2Xr9l7Hmjq3BJfa4Fuci4NJZKwOcrAokwb3lF3oRcIVG8c/S/B3gJdCzsQGaZ2MBbdNQKAJKPj+BFJGnbJZXPHOe2zSEnnlgIfecu1qbOKrwBz+8BkHDDzpzb7g9a5Pr6X54bkcSa1B/9oFtHEKxziptlnF68MqDYeODDz5cBIg1u5qDY9fuluJZGJzE9WG+uH+P5Av+64W3Gytnd6wZb88y2VOzuAWX3/fyz8X+KbXCxotPVvUxLn2Vn1+BvDdrfGI8tfFUCDjGJVR1A72YCQy84fRQMntwvlNhdQfFbweIwxexZZr6M3QgKbu/"
-    comment: "Stephan-Vits"
-    apply: false
   romy.pohl:
     uid: 25107
     key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDbIwT9SUdEoKJLPjpdIYWmeId0pG3t1NKkIdFI28ATNfCkTWuM/IB48cZbirgmVYguo8LRX7copA7MIYePwXhFVcJVUcUhsjfk6SwVVJtbfH3obGgplZBOwOmIa08IGt851+1WddCrwuZj3VoErinQ2vjs4n/LoIaoEwoBOS6KxgmZDvVH3g/gvBVuF5b0ZId564KcJyDK39O/8bA7iUPx07gVnojCH9b/j3pmCSfq44drGHVWiBhtu9WQs7xXyJgp2fN+l3ZIpiDPFqijs5394dAyovRfDjPKd3S3sqENjuTvnVnKyIPeGbYYLDu5WXPKQFP2zb+4NC3pACO8NZoN"
@@ -1183,10 +1179,6 @@ accounts::users:
     uid: 25401
     comment: "Bastian-Gutschke"
     apply: false
-  romy.pohl:
-    uid: 25107
-    comment: "Romy-Pohl"
-    apply: false
   gerrit.gruben:
     uid: 66800
     comment: "Gerrit-Gruben"

diff --git a/modules.yaml b/modules.yaml
index 581b8331ac41eca3bb9c7a8c8fa853de20ddaa3e..2593235cd95631db8e5a624d24b86370f093f2ca 100644 (file)
--- a/modules.yaml
+++ b/modules.yaml
@@ -232,4 +232,3 @@ zabbix::agent::zabbix_version: '2.4'
 # MySQL Monitoring
 # mysql monitoring
 infra::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGr1ESvzfZx4F3HW99qZFf/MkLh1pywxTBCxk5PxFxPCbLY7OT8wNIcxvS6NOvMhr2qkAvmec0qB/1pJf1ZiM99VRoTSF8jByxMFeopYdFhyk3nHtGIyqgykm6xp4hg+hJH2tsg7SYhPN8cV3wDeZgAsvWUhp4TUid6Y/3w7jLzQF+odiUPFCyZ0IbSiQJOe4/E1N5ldx29pfOdjxxRv6Kkf7jNg9CChNYNpLkM8SI5JC41O5avNcrvfaiekiWEJV0mZ59dE1yPqzMF8TstEuq6BJd7KeNj0HN9yGc2cZxTqXhDr1o/HfUsH7Z+beZVHN/qBlqKBbx9fCUbGX8ekQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA5BffAEhe8IJ8QeKaed4zYgCCGKLxaE3iurFnp+6acicSVCgZMLNoRQqJDZ6CeSY8uGw==]
-

diff --git a/yamllint.config b/yamllint.config
deleted file mode 100644 (file)
index dd3f468..0000000
--- a/yamllint.config
+++ /dev/null
@@ -1,49 +0,0 @@
----
-
-rules:
-  braces:
-    min-spaces-inside: 0
-    max-spaces-inside: 1
-    min-spaces-inside-empty: 0
-    max-spaces-inside-empty: 1
-  brackets:
-    min-spaces-inside: 0
-    max-spaces-inside: 1
-    min-spaces-inside-empty: 0
-    max-spaces-inside-empty: 1
-  colons:
-    max-spaces-before: 0
-    max-spaces-after: 1
-  commas:
-    max-spaces-before: 1
-    min-spaces-after: 1
-    max-spaces-after: 1
-  comments:
-    level: warning
-    require-starting-space: true
-    min-spaces-from-content: 2
-  comments-indentation:
-    level: warning
-  document-end: disable
-  document-start:
-    level: warning
-    present: true
-  empty-lines:
-    max: 2
-    max-start: 0
-    max-end: 0
-  hyphens:
-    max-spaces-after: 1
-  indentation:
-    spaces: consistent
-    indent-sequences: true
-    check-multi-line-strings: false
-  key-duplicates: enable
-  line-length: disable
-  new-line-at-end-of-file: enable
-  new-lines:
-    type: unix
-  trailing-spaces: enable
-  truthy:
-    level: warning
-

diff --git a/yamllint.yaml b/yamllint.yaml
new file mode 100644 (file)
index 0000000..bf5a036
--- /dev/null
+++ b/yamllint.yaml
@@ -0,0 +1,46 @@
+---
+rules:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 1
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 1
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: 1
+  commas:
+    max-spaces-before: 1
+    min-spaces-after: 1
+    max-spaces-after: 1
+  comments:
+    level: warning
+    require-starting-space: true
+    min-spaces-from-content: 2
+  comments-indentation: disable
+  document-end: disable
+  document-start:
+    level: warning
+    present: true
+  empty-lines:
+    max: 2
+    max-start: 0
+    max-end: 0
+  hyphens:
+    max-spaces-after: 1
+  indentation:
+    spaces: consistent
+    indent-sequences: true
+    check-multi-line-strings: false
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: enable
+  new-lines:
+    type: unix
+  trailing-spaces: enable
+  truthy:
+    level: warning