smart_proxy_monitoring 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ec7e1ae3a0926b300c520f7b8662ac70b5c497712974eed34071f450559d5a
-  data.tar.gz: 8fb8d22594814a7a14228695a294377eef17fd751d39461f072fac269f5efa0a
+  metadata.gz: e366cc37c357a3178a8d28262e1b177a384296778987df9b7107fb400a22dfae
+  data.tar.gz: 6f38e4e49c70adc11feee5bf495c00650dbe5aaf7f5187a5dca31e1c80edbc3e
 SHA512:
-  metadata.gz: e8fa63a47d22f009520c4ffde668b9d93b11c12a1801ec205b3f42379bb5d3f653695dead3bd9a1d875fcd757fc994d2c20175fff93ef3aae30b6b77b82f5c63
-  data.tar.gz: 10f9b88a20566a5e8663039b3f5076f810c41b83006425b8acd26c32e6cfa85d6833f294e78b4b2c640c6d6c3872a6bc8db660bf64f523762dfaa4e98421b018
+  metadata.gz: bbfbf8d19457f374c487630507cfd867aed6726bc3d84396e31596b648c26e047bc8ccf084d801edba5ea9667e3c17fb609f2cce47d6e033cf7c036c0c3df286
+  data.tar.gz: 846663a2a6aaee48323920970a3199326d888f45918ac575808699267f6b1af11181d3bd2d4f71db8bc5efb79aab13bc11a0798b02a540a014df04776cf1b13f

data/lib/smart_proxy_monitoring/monitoring_api.rb

@@ -58,11 +58,14 @@ module Proxy::Monitoring
       comment = params[:comment] || 'triggered by foreman'
       start_time = params[:start_time] || Time.now.to_i
       end_time = params[:end_time] || (Time.now.to_i + (24 * 3600))
+      all_services = params[:all_services]
 
       log_provider_errors do
         validate_dns_name!(host)
         host = strip_domain(host)
 
+        server.set_downtime_host(host, author, comment, start_time, end_time, all_services: all_services)
+      rescue ArgumentError
         server.set_downtime_host(host, author, comment, start_time, end_time)
       end
     end

data/lib/smart_proxy_monitoring/monitoring_plugin.rb

@@ -11,6 +11,8 @@ module Proxy::Monitoring
     uses_provider
     default_settings use_provider: 'monitoring_icinga2'
     default_settings collect_status: true
+    expose_setting :collect_status
+    expose_setting :strip_domain
 
     http_rackup_path File.expand_path('monitoring_http_config.ru', File.expand_path('../', __FILE__))
     https_rackup_path File.expand_path('monitoring_http_config.ru', File.expand_path('../', __FILE__))

data/lib/smart_proxy_monitoring/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Monitoring
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/smart_proxy_monitoring_icinga2/icinga2_result_uploader.rb

@@ -3,7 +3,7 @@ require 'thread'
 module ::Proxy::Monitoring::Icinga2
   class MonitoringResult < Proxy::HttpRequest::ForemanRequest
     def push_result(result)
-      send_request(request_factory.create_post('api/monitoring_results', result))
+      send_request(request_factory.create_post('api/v2/monitoring_results', result))
     end
   end
 

data/lib/smart_proxy_monitoring_icinga2/monitoring_icinga2_main.rb

@@ -58,7 +58,7 @@ module Proxy::Monitoring::Icinga2
       result.to_json
     end
 
-    def set_downtime_host(host, author, comment, start_time, end_time)
+    def set_downtime_host(host, author, comment, start_time, end_time, all_services: nil, **)
       request_url = "/actions/schedule-downtime?type=Host&filter=#{uri_encode_filter("host.name==\"#{host}\"")}"
       data = {
         'author' => author,
@@ -67,6 +67,7 @@ module Proxy::Monitoring::Icinga2
         'end_time' => end_time,
         'duration' => 1000
       }
+      data['all_services'] = all_services unless all_services.nil?
 
       result = with_errorhandling("Set downtime on #{host}") do
         Icinga2Client.post(request_url, data.to_json)

data/lib/smart_proxy_monitoring_icinga2/monitoring_icinga2_plugin.rb

@@ -5,6 +5,11 @@ module ::Proxy::Monitoring::Icinga2
     default_settings server: 'localhost'
     default_settings api_port: '5665'
     default_settings verify_ssl: true
+    expose_setting :server
+    expose_setting :api_user
+    capability("config")
+    capability("downtime")
+    capability("status") unless Proxy::Monitoring::Plugin.settings.collect_status
 
     requires :monitoring, ::Proxy::Monitoring::VERSION
 

data/lib/smart_proxy_monitoring_icingadirector/monitoring_icingadirector_plugin.rb

@@ -3,6 +3,9 @@ module ::Proxy::Monitoring::IcingaDirector
     plugin :monitoring_icingadirector, ::Proxy::Monitoring::VERSION
 
     default_settings verify_ssl: true
+    expose_setting :director_url
+    expose_setting :director_user
+    capability("config")
 
     requires :monitoring, ::Proxy::Monitoring::VERSION
     requires :monitoring_icinga2, ::Proxy::Monitoring::VERSION

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Timo Goebel
 - Dirk Goetz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -121,11 +121,11 @@ files:
 - settings.d/monitoring.yml.example
 - settings.d/monitoring_icinga2.yml.example
 - settings.d/monitoring_icingadirector.yml.example
-homepage: http://github.com/theforeman/smart_proxy_monitoring
+homepage: https://github.com/theforeman/smart_proxy_monitoring
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Monitoring plug-in for Foreman's smart proxy
 test_files: []