Skip to content

monitoring: activate the logstash probe via a filter on the plugins

Vincent Sellier requested to merge generated-differential-D5716-source into generated-differential-D5716-target
  • Fix the filter issue introduced in the previous commit.
  • Add an header on the scripts

Related to T3222

Test Plan

  • pergamon
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
- Concat::Fragment[icinga2::object::CheckCommand::check_logstash_errors.sh]
*******************************************
  Concat::Fragment[icinga2::object::Service::logstash_errors] =>
   parameters =>
     content =>
      @@ -5,5 +5,5 @@
         check_command = "check_logstash_errors.sh"
         command_endpoint = host.name
      -  assign where "\"check_logstash_errors.sh\"" in host.vars.plugins
      +  assign where "check_logstash_errors.sh" in host.vars.plugins
         ignore where host.vars.noagent
       }
*******************************************
- Concat_fragment[icinga2::object::CheckCommand::check_logstash_errors.sh]
*******************************************
  Concat_fragment[icinga2::object::Service::logstash_errors] =>
   parameters =>
     content =>
      @@ -5,5 +5,5 @@
         check_command = "check_logstash_errors.sh"
         command_endpoint = host.name
      -  assign where "\"check_logstash_errors.sh\"" in host.vars.plugins
      +  assign where "check_logstash_errors.sh" in host.vars.plugins
         ignore where host.vars.noagent
       }
*******************************************
- Icinga2::Object::Checkcommand[check_logstash_errors.sh]
*******************************************
  Icinga2::Object::Service[logstash_errors] =>
   parameters =>
     assign =>
      - ["\"check_logstash_errors.sh\" in host.vars.plugins"]
      + ["check_logstash_errors.sh in host.vars.plugins"]
*******************************************
- Icinga2::Object[icinga2::object::CheckCommand::check_logstash_errors.sh]
*******************************************
  Icinga2::Object[icinga2::object::Service::logstash_errors] =>
   parameters =>
     assign =>
      - ["\"check_logstash_errors.sh\" in host.vars.plugins"]
      + ["check_logstash_errors.sh in host.vars.plugins"]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org
  • logstash0
diff origin/production/logstash0.internal.softwareheritage.org current/logstash0.internal.softwareheritage.org
*******************************************
  File[/usr/lib/nagios/plugins/swh/check_logstash_errors.sh] =>
   parameters =>
     content =>
      @@ -1,4 +1,30 @@
       #!/bin/bash
      _
      +#
      +# File managed by puppet. All modifications will be lost.
      +#
      +# Check if logstash encountered errors when sending messages
      +# to its output.
      +#
      +# Copyright (c) 2017 The Software Heritage Developers
      +#
      +# Permission is hereby granted, free of charge, to any person obtaining a copy
      +# of this software and associated documentation files (the "Software"), to deal
      +# in the Software without restriction, including without limitation the rights
      +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
      +# copies of the Software, and to permit persons to whom the Software is
      +# furnished to do so, subject to the following conditions:
      +#
      +# The above copyright notice and this permission notice shall be included in
      +# all copies or substantial portions of the Software.
      +#
      +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
      +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
      +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
      +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
      +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
      +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
      +# SOFTWARE.
      +
       CODE_CRITICAL=2
       CODE_OK=0
*******************************************
*** End octocatalog-diff on logstash0.internal.softwareheritage.org
  • no changes on other hosts

Migrated from D5716 (view on Phabricator)

Merge request reports