Staging instance, all changes can be removed at any time

Skip to content

Declare the mandatory icinga host

Vincent Sellier requested to merge generated-differential-D4477-source into generated-differential-D4477-target

also remove a unused variable

Related to T2755

Test Plan

octocatalog-diff on pergamon:

diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ Concat::Fragment[icinga2::object::Host::glyptotek.internal.softwareheritage.org] =>
   parameters =>
     "content": "\nobject Host \"glyptotek.internal.softwareheritage.org\" {\n  d...
     "order": 50,
     "target": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.o...
*******************************************
+ Concat::Fragment[icinga2::object::Host::pushkin.internal.softwareheritage.org] =>
   parameters =>
     "content": "\nobject Host \"pushkin.internal.softwareheritage.org\" {\n  dis...
     "order": 50,
     "target": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org...
*******************************************
+ Concat[/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.org.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure": "present",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "nagios",
     "mode": "0640",
     "notify": [
       "Class[Icinga2::Service]"
     ],
     "order": "alpha",
     "owner": "root",
     "path": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.org...
     "replace": true,
     "show_diff": true,
     "tag": "icinga2::config::file",
     "warn": true
*******************************************
+ Concat[/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure": "present",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "nagios",
     "mode": "0640",
     "notify": [
       "Class[Icinga2::Service]"
     ],
     "order": "alpha",
     "owner": "root",
     "path": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org.c...
     "replace": true,
     "show_diff": true,
     "tag": "icinga2::config::file",
     "warn": true
*******************************************
+ Concat_file[/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.org.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "nagios",
     "mode": "0640",
     "order": "alpha",
     "owner": "root",
     "replace": true,
     "show_diff": true,
     "tag": "_etc_icinga2_zones.d_master_glyptotek.internal.softwareheritage.org....
*******************************************
+ Concat_file[/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org.conf] =>
   parameters =>
     "backup": "puppet",
     "ensure_newline": false,
     "force": false,
     "format": "plain",
     "group": "nagios",
     "mode": "0640",
     "order": "alpha",
     "owner": "root",
     "replace": true,
     "show_diff": true,
     "tag": "_etc_icinga2_zones.d_master_pushkin.internal.softwareheritage.org.co...
*******************************************
+ Concat_fragment[/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.org.conf_header] =>
   parameters =>
     "content": "# This file is managed by Puppet. DO NOT EDIT.\n",
     "order": "0",
     "tag": "_etc_icinga2_zones.d_master_glyptotek.internal.softwareheritage.org....
     "target": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.o...
*******************************************
+ Concat_fragment[/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org.conf_header] =>
   parameters =>
     "content": "# This file is managed by Puppet. DO NOT EDIT.\n",
     "order": "0",
     "tag": "_etc_icinga2_zones.d_master_pushkin.internal.softwareheritage.org.co...
     "target": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org...
*******************************************
+ Concat_fragment[icinga2::object::Host::glyptotek.internal.softwareheritage.org] =>
   parameters =>
     "content": "\nobject Host \"glyptotek.internal.softwareheritage.org\" {\n  d...
     "order": 50,
     "tag": "_etc_icinga2_zones.d_master_glyptotek.internal.softwareheritage.org....
     "target": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.o...
*******************************************
+ Concat_fragment[icinga2::object::Host::pushkin.internal.softwareheritage.org] =>
   parameters =>
     "content": "\nobject Host \"pushkin.internal.softwareheritage.org\" {\n  dis...
     "order": 50,
     "tag": "_etc_icinga2_zones.d_master_pushkin.internal.softwareheritage.org.co...
     "target": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org...
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "1J0F7tfOb2FvXSkkCMihrgb/3b6LboZPN8ClVXXsNaXCCTazUq805CdpZtAhXYLCpzuWZ42uBAgYMsbI4VL8og==";
      + secret "r+CqhitVGmQO6imtigUz+K34NMYZ+uGGEEYdSffLG6BnbH47xtLhwew02E9cgERUXcEAlfJtETFZhe7eCuSHOw==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "X8pMQkFmC+aPM+Hcl9AmLSPrc10Vg8/DgSDzaTjRGNCj4wjBXcX88XnhpR7+b3XMb5wPFwxe4FtCfqVM/6v71Q==";
      + secret "rrSjO9pYANLlAy5XI2HHdkoASNW0oLqyDTaZ8jwf+XRuKwSRF5+1kmmkBdXSvfg0hywCVRdI3SVd0REFLVmoDw==";
       };
*******************************************
+ Icinga2::Object::Host[glyptotek.internal.softwareheritage.org] =>
   parameters =>
     "check_command": "hostalive",
     "display_name": "glyptotek.internal.softwareheritage.org",
     "ensure": "present",
     "host_name": "glyptotek.internal.softwareheritage.org",
     "import": [
    
     ],
     "order": 50,
     "target": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.o...
     "template": false
*******************************************
+ Icinga2::Object::Host[pushkin.internal.softwareheritage.org] =>
   parameters =>
     "check_command": "hostalive",
     "display_name": "pushkin.internal.softwareheritage.org",
     "ensure": "present",
     "host_name": "pushkin.internal.softwareheritage.org",
     "import": [
    
     ],
     "order": 50,
     "target": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org...
     "template": false
*******************************************
+ Icinga2::Object[icinga2::object::Host::glyptotek.internal.softwareheritage.org] =>
   parameters =>
     "apply": false,
     "assign": [
    
     ],
     "attrs": {
       "display_name": "glyptotek.internal.softwareheritage.org",
       "check_command": "hostalive"
     },
     "attrs_list": [
       "address",
       "address6",
       "groups",
       "display_name",
       "check_command",
       "max_check_attempts",
       "check_period",
       "check_timeout",
       "check_interval",
       "retry_interval",
       "enable_notifications",
       "enable_active_checks",
       "enable_passive_checks",
       "enable_event_handler",
       "enable_flapping",
       "enable_perfdata",
       "event_command",
       "flapping_threshold_low",
       "flapping_threshold_high",
       "volatile",
       "zone",
       "command_endpoint",
       "notes",
       "notes_url",
       "action_url",
       "icon_image",
       "icon_image_alt",
       "vars",
       "Acknowledgement",
       "ApiBindHost",
       "ApiBindPort",
       "ApiEnvironment",
       "ApplicationType",
       "AttachDebugger",
       "BuildCompilerName",
       "BuildCompilerVersion",
       "BuildHostName",
       "Concurrency",
       "Critical",
       "Custom",
       "Deprecated",
       "Down",
       "DowntimeEnd",
       "DowntimeRemoved",
       "DowntimeStart",
       "Environment",
       "FlappingEnd",
       "FlappingStart",
       "HostDown",
       "HostUp",
       "IncludeConfDir",
       "Internal",
       "Json",
       "LocalStateDir",
       "LogCritical",
       "LogDebug",
       "LogInformation",
       "LogNotice",
       "LogWarning",
       "Math",
       "MaxConcurrentChecks",
       "ModAttrPath",
       "NodeName",
       "OK",
       "ObjectsPath",
       "PidPath",
       "PkgDataDir",
       "PlatformArchitecture",
       "PlatformKernel",
       "PlatformKernelVersion",
       "PlatformName",
       "PlatformVersion",
       "PrefixDir",
       "Problem",
       "Recovery",
       "RunAsGroup",
       "RunAsUser",
       "RunDir",
       "ServiceCritical",
       "ServiceOK",
       "ServiceUnknown",
       "ServiceWarning",
       "StatePath",
       "SysconfDir",
       "System",
       "Types",
       "Unknown",
       "Up",
       "UseVfork",
       "VarsPath",
       "Warning",
       "ZonesDir",
       "NodeName",
       "ZoneName",
       "TicketSalt",
       "PluginDir",
       "PluginContribDir",
       "ManubulonPluginDir",
       "name",
       "NodeName",
       "ZoneName",
       "TicketSalt",
       "PluginDir",
       "PluginContribDir",
       "ManubulonPluginDir",
       "name"
     ],
     "ensure": "present",
     "ignore": [
    
     ],
     "import": [
    
     ],
     "object_name": "glyptotek.internal.softwareheritage.org",
     "object_type": "Host",
     "order": 50,
     "prefix": false,
     "target": "/etc/icinga2/zones.d/master/glyptotek.internal.softwareheritage.o...
     "template": false
*******************************************
+ Icinga2::Object[icinga2::object::Host::pushkin.internal.softwareheritage.org] =>
   parameters =>
     "apply": false,
     "assign": [
    
     ],
     "attrs": {
       "display_name": "pushkin.internal.softwareheritage.org",
       "check_command": "hostalive"
     },
     "attrs_list": [
       "address",
       "address6",
       "groups",
       "display_name",
       "check_command",
       "max_check_attempts",
       "check_period",
       "check_timeout",
       "check_interval",
       "retry_interval",
       "enable_notifications",
       "enable_active_checks",
       "enable_passive_checks",
       "enable_event_handler",
       "enable_flapping",
       "enable_perfdata",
       "event_command",
       "flapping_threshold_low",
       "flapping_threshold_high",
       "volatile",
       "zone",
       "command_endpoint",
       "notes",
       "notes_url",
       "action_url",
       "icon_image",
       "icon_image_alt",
       "vars",
       "Acknowledgement",
       "ApiBindHost",
       "ApiBindPort",
       "ApiEnvironment",
       "ApplicationType",
       "AttachDebugger",
       "BuildCompilerName",
       "BuildCompilerVersion",
       "BuildHostName",
       "Concurrency",
       "Critical",
       "Custom",
       "Deprecated",
       "Down",
       "DowntimeEnd",
       "DowntimeRemoved",
       "DowntimeStart",
       "Environment",
       "FlappingEnd",
       "FlappingStart",
       "HostDown",
       "HostUp",
       "IncludeConfDir",
       "Internal",
       "Json",
       "LocalStateDir",
       "LogCritical",
       "LogDebug",
       "LogInformation",
       "LogNotice",
       "LogWarning",
       "Math",
       "MaxConcurrentChecks",
       "ModAttrPath",
       "NodeName",
       "OK",
       "ObjectsPath",
       "PidPath",
       "PkgDataDir",
       "PlatformArchitecture",
       "PlatformKernel",
       "PlatformKernelVersion",
       "PlatformName",
       "PlatformVersion",
       "PrefixDir",
       "Problem",
       "Recovery",
       "RunAsGroup",
       "RunAsUser",
       "RunDir",
       "ServiceCritical",
       "ServiceOK",
       "ServiceUnknown",
       "ServiceWarning",
       "StatePath",
       "SysconfDir",
       "System",
       "Types",
       "Unknown",
       "Up",
       "UseVfork",
       "VarsPath",
       "Warning",
       "ZonesDir",
       "NodeName",
       "ZoneName",
       "TicketSalt",
       "PluginDir",
       "PluginContribDir",
       "ManubulonPluginDir",
       "name",
       "NodeName",
       "ZoneName",
       "TicketSalt",
       "PluginDir",
       "PluginContribDir",
       "ManubulonPluginDir",
       "name"
     ],
     "ensure": "present",
     "ignore": [
    
     ],
     "import": [
    
     ],
     "object_name": "pushkin.internal.softwareheritage.org",
     "object_type": "Host",
     "order": 50,
     "prefix": false,
     "target": "/etc/icinga2/zones.d/master/pushkin.internal.softwareheritage.org...
     "template": false
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Migrated from D4477 (view on Phabricator)

Merge request reports