Commit 5f025c7b authored by Walter Heck's avatar Walter Heck

Merge branch '6-elastic-stack-upgrade' of...

Merge branch '6-elastic-stack-upgrade' of https://gitlab.olindata.com/opstheater/opstheater into 6-elastic-stack-upgrade

Conflicts:
	site/opstheater/manifests/profile/icinga/server.pp
parents 0fd08347 8398e9ac
Pipeline #332 failed with stages
in 3 minutes and 1 second
......@@ -9,10 +9,6 @@ if not ENV['SPEC_OPTS']
ENV['SPEC_OPTS'] = '--format documentation'
end
PuppetLint.configuration.send('disable_documentation')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_140chars')
PuppetSyntax.exclude_paths = [
"vendor/**/*.*",
"modules/**/*.pp",
......@@ -30,6 +26,32 @@ PuppetLint.configuration.ignore_paths = [
Rake::Task[:lint].clear
PuppetLint::RakeTask.new :lint do |config|
config.ignore_paths = PuppetLint.configuration.ignore_paths
# List of checks to disable
config.disable_checks = ['documentation', '140chars']
# Should puppet-lint prefix it's output with the file being checked,
# defaults to true
config.with_filename = true
# Should the task fail if there were any warnings, defaults to false
config.fail_on_warnings = true
# Format string for puppet-lint's output (see the puppet-lint help output
# for details
# config.log_format = '%{filename} - %{message}'
# Print out the context for the problem, defaults to false
config.with_context = true
# Enable automatic fixing of problems, defaults to false
config.fix = false
# Show ignored problems in the output, defaults to false
config.show_ignored = true
# Compare module layout relative to the module root
config.relative = true
end
task :all => [ :validate, :metadata, :lint, :spec ]
......@@ -4,8 +4,8 @@ class opstheater::profile::icinga::client (
$lowercase_fqdn = downcase($::fqdn)
class { '::icinga2':
confd => false,
features => ['checker','mainlog'],
confd => false,
features => ['checker','mainlog'],
}
class { '::icinga2::feature::api':
......@@ -19,11 +19,11 @@ class opstheater::profile::icinga::client (
}
},
zones => {
'ZoneName' => {
'ZoneName' => {
'endpoints' => ['NodeName'],
'parent' => 'opstheater',
},
'opstheater' => {
'opstheater' => {
'endpoints' => ['icinga2.opstheater.vm'],
}
}
......
......@@ -12,7 +12,7 @@ class opstheater::profile::icinga::server (
'ZoneName' => 'master',
},
}
class { 'icinga2::feature::idomysql':
host => $icinga2_db_ipaddress,
port => '3306',
......@@ -41,12 +41,12 @@ class opstheater::profile::icinga::server (
accept_commands => true,
# when having multiple masters, you should enable:
# accept_config => true,
endpoints => {
endpoints => {
$icinga2_web_fqdn => {},
},
zones => {
'master' => {
'endpoints' => [$icinga2_web_fqdn],
zones => {
'master' => {
'endpoints' => [$icinga2_web_fqdn],
},
'opstheater' => {
'endpoints' => [$icinga2_web_fqdn],
......@@ -55,8 +55,6 @@ class opstheater::profile::icinga::server (
}
}
include icinga2::feature::api
Icinga2::Object::Host <<| |>>
Icinga2::Object::Service <<| |>>
Icinga2::Object::Zone <<| |>>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment