From 9e291d54dcb118678bf065ff6c9a0e5c6f378e58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 22 Nov 2012 22:18:36 +0200 Subject: [PATCH] - up to 2.0.4 major version change, depends on nagios ndoutils now --- cacti-plugin-npc-extinfo.patch | 2949 --------------------------- cacti-plugin-npc-path_headers.patch | 28 - cacti-plugin-npc.spec | 88 +- 3 files changed, 43 insertions(+), 3022 deletions(-) delete mode 100644 cacti-plugin-npc-extinfo.patch delete mode 100644 cacti-plugin-npc-path_headers.patch diff --git a/cacti-plugin-npc-extinfo.patch b/cacti-plugin-npc-extinfo.patch deleted file mode 100644 index 4f59a67..0000000 --- a/cacti-plugin-npc-extinfo.patch +++ /dev/null @@ -1,2949 +0,0 @@ ---- npc/extinfo.php.orig 2005-10-10 14:17:15.000000000 +0000 -+++ npc/extinfo.php 2006-12-26 16:32:52.000000000 +0000 -@@ -1,1473 +1,1473 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"; -- echo ""; -- --?> -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
--

 [ ] on --

--
--
Command: -- -- -- -- -- -- --
-- -- --
  
-- -- -- -- -- -- -- -- -- -- -- --
Service State Information
-- -- -- -- -- -- -- -- -- -- -- $value) { -- -- -- switch($key) -- { -- case "Current Status": -- echo ""; -- echo ""; -- switch($value) -- { -- case "-1": -- echo ""; -- break; -- case "0": -- echo ""; -- break; -- case "1": -- echo ""; -- break; -- case "2": -- echo ""; -- break; -- case "3": -- echo ""; -- break; -- } -- echo ""; -- break; -- case "State Duration": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Check Command": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Plugin Output": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Performance Data": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Current Attempt": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Last Check": -- echo ""; -- echo ""; -- if (preg_match('/1969-12-31/', $value)) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- case "Next Check": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Check Latency": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Check Duration": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "flapping": -- echo ""; -- echo ""; -- if ($service_detail["flapping"]) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- } -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- -- if ($key == "flapping") { -- echo ""; -- echo ""; -- if (!$service_config["event_handler"]) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- } -- -- -- } -- -- --?> -- -- --
ParameterValue
" . $key . ":PENDINGOKWARNINGCRITICALUNKNOWN
" . $key . ":" . formatTime($value) . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "/" . $service_detail["Max Attempts"] . "
" . $key . ":N/A" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
Flapping:YesNo
Event Handler:N/A" . $service_config["event_handler"] . "
-- --
-- --
-- -- -- -- -- -- -- -- -- -- --
Service Monitoring Options
-- -- -- -- -- -- -- -- -- --"; -- -- -- foreach ($service_config as $key => $value) { -- -- if ($key == "event_handler") { continue; } -- -- echo ""; -- -- switch($key) -- { -- case "active_checks_enabled": -- echo ""; -- break; -- case "passive_checks_enabled": -- echo ""; -- break; -- case "event_handler_enabled": -- echo ""; -- break; -- case "flap_detection_enabled": -- echo ""; -- break; -- case "notifications_enabled": -- echo ""; -- break; -- case "failure_prediction_enabled": -- echo ""; -- break; -- case "process_performance_data": -- echo ""; -- break; -- case "obsess_over_service": -- echo ""; -- break; -- } -- -- if ($value == 0) { -- echo ""; -- } else { -- echo ""; -- } -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- -- -- } -- --?> -- --
ParameterValue
Active Checks:Passive Checks:Event Handler:Flap Detection:Notifications:Failure Prediction:Process Performance Data:Obsess Over Service:Disabled
Enabled
--
-- --
  
  
-- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Service Comments
-- -- -- -- -- -- -- -- -- -- --"; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- } -- -- -- -- -- -- -- --?> -- --
Entry TimeAuthorCommentPersistentTypeDelete
" . $comments[$i]["timestamp"] . "" . $comments[$i]["author"] . "" . $comments[$i]["comment"] . ""; -- if ($comments[$i]["persist"]) { -- echo "Yes"; -- } else { -- echo "No"; -- } -- echo ""; -- if ($comments[$i]["type"] == 2) { -- echo "Comment"; -- } elseif ($comments[$i]["type"] == 4) { -- echo "Acknowledgment"; -- } -- echo ""; -- if ($comments[$i]["type"] == 2) { -- echo "delete"; -- } elseif ($comments[$i]["type"] == 4) { -- echo "Remove"; -- } -- echo "
--
-- Add a comment"; -- echo "Delete all comments"; -- ?> --
--
  
  
-- -- -- -- -- -- -- -- -- "; -- } -- ?> -- -- -- --
Graph Mapping
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Associated graph: -- --
-- "; -- echo "
"; -- echo ""; -- echo "
-- --
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"; -- echo ""; -- --?> -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
--

 

--
--
Command: -- -- -- -- --
-- -- --
View Services | graph_view.php?action=tree&tree_id=1&leaf_id='>View Graphs | Configure 
  
-- -- -- -- -- -- -- -- -- -- -- --
Host State Information
-- -- -- -- -- -- -- -- -- -- -- $host_history["soft_state"], -- 'State Duration' => formatTime($duration), -- 'Check Command' => $host_check["check_command"], -- 'Plugin Output' => $host_history["plugin_output"], -- 'Performance Data' => $host_check["performance_data"], -- 'Current Attempt' => $host_history["current_attempt"], -- 'Last Check' => $host_check["last_check"], -- 'Next Check' => $host_check["next_check"], -- 'Check Latency' => $host_check["check_latency"], -- 'Check Duration' => $host_check["check_execute_time"], -- 'flapping' => $host_flapping["flapping"], -- 'Event Handler' => $host_config["event_handler"], -- ); -- -- foreach ($host_detail as $key => $value) { -- -- -- switch($key) -- { -- case "Current Status": -- echo ""; -- echo ""; -- switch($value) -- { -- case "-1": -- echo ""; -- break; -- case "0": -- echo ""; -- break; -- case "1": -- echo ""; -- break; -- case "2": -- echo ""; -- break; -- } -- echo ""; -- break; -- case "State Duration": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Check Command": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Plugin Output": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Performance Data": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Current Attempt": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Last Check": -- echo ""; -- echo ""; -- if (preg_match('/1969-12-31/', $value)) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- case "Next Check": -- echo ""; -- echo ""; -- if (preg_match('/1969-12-31/', $value)) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- case "Check Latency": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "Check Duration": -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- break; -- case "flapping": -- echo ""; -- echo ""; -- if ($host_detail["flapping"]) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- case "Event Handler": -- echo ""; -- echo ""; -- if (!$value) { -- echo ""; -- } else { -- echo ""; -- } -- echo ""; -- break; -- } -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- -- } -- -- --?> -- -- --
ParameterValue
" . $key . ":PENDINGUPDOWNUNREACHABLE
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "/" . $host_check["max_attempts"] . "
" . $key . ":N/A" . $value . "
" . $key . ":N/A" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
Flapping:YesNo
" . $key . ":N/A" . $value . "
-- --
-- --
-- -- -- -- -- -- -- -- -- -- --
Host Monitoring Options
-- -- -- -- -- -- -- -- -- --"; -- -- -- foreach ($host_config as $key => $value) { -- -- if ($key == "event_handler") { continue; } -- if ($key == "cacti_graph_id") { continue; } -- -- echo ""; -- -- switch($key) -- { -- case "active_checks_enabled": -- echo ""; -- break; -- case "passive_checks_enabled": -- echo ""; -- break; -- case "event_handler_enabled": -- echo ""; -- break; -- case "flap_detection_enabled": -- echo ""; -- break; -- case "notifications_enabled": -- echo ""; -- break; -- case "failure_prediction_enabled": -- echo ""; -- break; -- case "process_performance_data": -- echo ""; -- break; -- case "obsess_over_host": -- echo ""; -- break; -- } -- -- if ($value == 0) { -- echo ""; -- } else { -- echo ""; -- } -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- -- -- } -- --?> -- --
ParameterValue
Active Checks:Passive Checks:Event Handler:Flap Detection:Notifications:Failure Prediction:Process Performance Data:Obsess Over Host:Disabled
Enabled
--
-- --
  
  
-- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Host Comments
-- -- -- -- -- -- -- -- -- -- --"; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- echo ""; -- -- -- if($rowColor == $background1) { -- $rowColor = $background2; -- } else { -- $rowColor = $background1; -- } -- } -- -- -- -- -- -- -- --?> -- --
Entry TimeAuthorCommentPersistentTypeDelete
" . $comments[$i]["timestamp"] . "" . $comments[$i]["author"] . "" . $comments[$i]["comment"] . ""; -- if ($comments[$i]["persist"]) { -- echo "Yes"; -- } else { -- echo "No"; -- } -- echo ""; -- if ($comments[$i]["type"] == 1) { -- echo "Comment"; -- } elseif ($comments[$i]["type"] == 3) { -- echo "Acknowledgment"; -- } -- echo ""; -- if ($comments[$i]["type"] == 1) { -- echo "delete"; -- } elseif ($comments[$i]["type"] == 3) { -- echo "Remove"; -- } -- echo "
--
-- Add a comment"; -- echo "Delete all comments"; -- ?> --
--
  
  
-- -- -- -- -- -- -- -- -- "; -- } -- ?> -- -- -- --
Graph Mapping
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Associated graph: -- --
-- "; -- echo "
"; -- echo ""; -- echo "
-- --
-- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ echo ""; -+ -+?> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+

 [ ] on -+

-+
-+
Command: -+ -+ -+ -+ -+ -+ -+
-+ -+ -+
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Service State Information
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ $value) { -+ -+ -+ switch($key) -+ { -+ case "Current Status": -+ echo ""; -+ echo ""; -+ switch($value) -+ { -+ case "-1": -+ echo ""; -+ break; -+ case "0": -+ echo ""; -+ break; -+ case "1": -+ echo ""; -+ break; -+ case "2": -+ echo ""; -+ break; -+ case "3": -+ echo ""; -+ break; -+ } -+ echo ""; -+ break; -+ case "State Duration": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Check Command": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Plugin Output": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Performance Data": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Current Attempt": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Last Check": -+ echo ""; -+ echo ""; -+ if (preg_match('/1969-12-31/', $value)) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ case "Next Check": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Check Latency": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Check Duration": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "flapping": -+ echo ""; -+ echo ""; -+ if ($service_detail["flapping"]) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ } -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ -+ if ($key == "flapping") { -+ echo ""; -+ echo ""; -+ if (!$service_config["event_handler"]) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ } -+ -+ -+ } -+ -+ -+?> -+ -+ -+
ParameterValue
" . $key . ":PENDINGOKWARNINGCRITICALUNKNOWN
" . $key . ":" . formatTime($value) . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "/" . $service_detail["Max Attempts"] . "
" . $key . ":N/A" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
Flapping:YesNo
Event Handler:N/A" . $service_config["event_handler"] . "
-+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Service Monitoring Options
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ -+ -+ foreach ($service_config as $key => $value) { -+ -+ if ($key == "event_handler") { continue; } -+ -+ echo ""; -+ -+ switch($key) -+ { -+ case "active_checks_enabled": -+ echo ""; -+ break; -+ case "passive_checks_enabled": -+ echo ""; -+ break; -+ case "event_handler_enabled": -+ echo ""; -+ break; -+ case "flap_detection_enabled": -+ echo ""; -+ break; -+ case "notifications_enabled": -+ echo ""; -+ break; -+ case "failure_prediction_enabled": -+ echo ""; -+ break; -+ case "process_performance_data": -+ echo ""; -+ break; -+ case "obsess_over_service": -+ echo ""; -+ break; -+ } -+ -+ if ($value == 0) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ -+ -+ } -+ -+?> -+ -+
ParameterValue
Active Checks:Passive Checks:Event Handler:Flap Detection:Notifications:Failure Prediction:Process Performance Data:Obsess Over Service:Disabled
Enabled
-+
-+ -+
  
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Service Comments
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ } -+ -+ -+ -+ -+ -+ -+ -+?> -+ -+
Entry TimeAuthorCommentPersistentTypeDelete
" . $comments[$i]["timestamp"] . "" . $comments[$i]["author"] . "" . $comments[$i]["comment"] . ""; -+ if ($comments[$i]["persist"]) { -+ echo "Yes"; -+ } else { -+ echo "No"; -+ } -+ echo ""; -+ if ($comments[$i]["type"] == 2) { -+ echo "Comment"; -+ } elseif ($comments[$i]["type"] == 4) { -+ echo "Acknowledgment"; -+ } -+ echo ""; -+ if ($comments[$i]["type"] == 2) { -+ echo "delete"; -+ } elseif ($comments[$i]["type"] == 4) { -+ echo "Remove"; -+ } -+ echo "
-+
-+ Add a comment"; -+ echo "Delete all comments"; -+ ?> -+
-+
  
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ "; -+ } -+ ?> -+ -+ -+ -+
Graph Mapping
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Associated graph: -+ -+
-+ "; -+ echo "
"; -+ echo ""; -+ echo "
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ echo ""; -+ -+?> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+

 

-+
-+
Command: -+ -+ -+ -+ -+
-+ -+ -+
View Services | graph_view.php?action=tree&tree_id=1&leaf_id='>View Graphs | Configure 
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Host State Information
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ $host_history["soft_state"], -+ 'State Duration' => formatTime($duration), -+ 'Check Command' => $host_check["check_command"], -+ 'Plugin Output' => $host_history["plugin_output"], -+ 'Performance Data' => $host_check["performance_data"], -+ 'Current Attempt' => $host_history["current_attempt"], -+ 'Last Check' => $host_check["last_check"], -+ 'Next Check' => $host_check["next_check"], -+ 'Check Latency' => $host_check["check_latency"], -+ 'Check Duration' => $host_check["check_execute_time"], -+ 'flapping' => $host_flapping["flapping"], -+ 'Event Handler' => $host_config["event_handler"], -+ ); -+ -+ foreach ($host_detail as $key => $value) { -+ -+ -+ switch($key) -+ { -+ case "Current Status": -+ echo ""; -+ echo ""; -+ switch($value) -+ { -+ case "-1": -+ echo ""; -+ break; -+ case "0": -+ echo ""; -+ break; -+ case "1": -+ echo ""; -+ break; -+ case "2": -+ echo ""; -+ break; -+ } -+ echo ""; -+ break; -+ case "State Duration": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Check Command": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Plugin Output": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Performance Data": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Current Attempt": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Last Check": -+ echo ""; -+ echo ""; -+ if (preg_match('/1969-12-31/', $value)) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ case "Next Check": -+ echo ""; -+ echo ""; -+ if (preg_match('/1969-12-31/', $value)) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ case "Check Latency": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "Check Duration": -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ break; -+ case "flapping": -+ echo ""; -+ echo ""; -+ if ($host_detail["flapping"]) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ case "Event Handler": -+ echo ""; -+ echo ""; -+ if (!$value) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ echo ""; -+ break; -+ } -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ -+ } -+ -+ -+?> -+ -+ -+
ParameterValue
" . $key . ":PENDINGUPDOWNUNREACHABLE
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "/" . $host_check["max_attempts"] . "
" . $key . ":N/A" . $value . "
" . $key . ":N/A" . $value . "
" . $key . ":" . $value . "
" . $key . ":" . $value . "
Flapping:YesNo
" . $key . ":N/A" . $value . "
-+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Host Monitoring Options
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ -+ -+ foreach ($host_config as $key => $value) { -+ -+ if ($key == "event_handler") { continue; } -+ if ($key == "cacti_graph_id") { continue; } -+ -+ echo ""; -+ -+ switch($key) -+ { -+ case "active_checks_enabled": -+ echo ""; -+ break; -+ case "passive_checks_enabled": -+ echo ""; -+ break; -+ case "event_handler_enabled": -+ echo ""; -+ break; -+ case "flap_detection_enabled": -+ echo ""; -+ break; -+ case "notifications_enabled": -+ echo ""; -+ break; -+ case "failure_prediction_enabled": -+ echo ""; -+ break; -+ case "process_performance_data": -+ echo ""; -+ break; -+ case "obsess_over_host": -+ echo ""; -+ break; -+ } -+ -+ if ($value == 0) { -+ echo ""; -+ } else { -+ echo ""; -+ } -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ -+ -+ } -+ -+?> -+ -+
ParameterValue
Active Checks:Passive Checks:Event Handler:Flap Detection:Notifications:Failure Prediction:Process Performance Data:Obsess Over Host:Disabled
Enabled
-+
-+ -+
  
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Host Comments
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+"; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ echo ""; -+ -+ -+ if($rowColor == $background1) { -+ $rowColor = $background2; -+ } else { -+ $rowColor = $background1; -+ } -+ } -+ -+ -+ -+ -+ -+ -+ -+?> -+ -+
Entry TimeAuthorCommentPersistentTypeDelete
" . $comments[$i]["timestamp"] . "" . $comments[$i]["author"] . "" . $comments[$i]["comment"] . ""; -+ if ($comments[$i]["persist"]) { -+ echo "Yes"; -+ } else { -+ echo "No"; -+ } -+ echo ""; -+ if ($comments[$i]["type"] == 1) { -+ echo "Comment"; -+ } elseif ($comments[$i]["type"] == 3) { -+ echo "Acknowledgment"; -+ } -+ echo ""; -+ if ($comments[$i]["type"] == 1) { -+ echo "delete"; -+ } elseif ($comments[$i]["type"] == 3) { -+ echo "Remove"; -+ } -+ echo "
-+
-+ Add a comment"; -+ echo "Delete all comments"; -+ ?> -+
-+
  
  
-+ -+ -+ -+ -+ -+ -+ -+ -+ "; -+ } -+ ?> -+ -+ -+ -+
Graph Mapping
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Associated graph: -+ -+
-+ "; -+ echo "
"; -+ echo ""; -+ echo "
-+ -+
-+ -+ diff --git a/cacti-plugin-npc-path_headers.patch b/cacti-plugin-npc-path_headers.patch deleted file mode 100644 index 6f44c9e..0000000 --- a/cacti-plugin-npc-path_headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -uNr npc.orig/neb/inserter.c npc/neb/inserter.c ---- npc.orig/neb/inserter.c 2005-11-12 15:44:11.000000000 +0100 -+++ npc/neb/inserter.c 2006-03-28 09:09:33.000000000 +0200 -@@ -44,16 +44,16 @@ - #include - - /* include the needed event broker header files */ --#include "../include/nebmodules.h" --#include "../include/nebcallbacks.h" --#include "../include/nebstructs.h" --#include "../include/broker.h" -+#include "nagios/nebmodules.h" -+#include "nagios/nebcallbacks.h" -+#include "nagios/nebstructs.h" -+#include "nagios/broker.h" - - /* include some Nagios stuff as well */ --#include "../include/config.h" --#include "../include/common.h" --#include "../include/nagios.h" --#include "../include/objects.h" -+#include "nagios/config.h" -+#include "nagios/common.h" -+#include "nagios/nagios.h" -+#include "nagios/objects.h" - - #include - #include diff --git a/cacti-plugin-npc.spec b/cacti-plugin-npc.spec index a78d203..68ee8a4 100644 --- a/cacti-plugin-npc.spec +++ b/cacti-plugin-npc.spec @@ -1,74 +1,72 @@ # TODO -# - Edit the MySQL options on line 143 of /cacti/plugins/npc/neb/inserter.c +# - system Doctrine: phpdoctrine.spec +# - forum thread: http://forums.cacti.net/viewtopic.php?t=26540 %define plugin npc -%include /usr/lib/rpm/macros.perl -Summary: Plugin for Cacti - NPC +%define php_min_version 5.2.1 +%include /usr/lib/rpm/macros.php +Summary: Nagios Plugin for Cacti (NPC) Summary(pl.UTF-8): Wtyczka do Cacti - NPC Name: cacti-plugin-npc -Version: 0.1.1a +Version: 2.0.4 Release: 0.2 -License: GPL v2 +License: GPL v3 Group: Applications/WWW -Source0: http://forums.cacti.net/files/%{plugin}-%{version}.tar.gz -# Source0-md5: 325f2e49070420346b55b7b4e2994d34 -Patch0: %{name}-path_headers.patch -# inserter.c patch for nagios 3.0b6 from http://forums.cacti.net/about10327-0-asc-150.html -#Patch1: http://forums.cacti.net/files/neb_159.patch -# from http://forums.cacti.net/about10327-0-asc-135.html -Patch1: %{name}-extinfo.patch -URL: http://forums.cacti.net/about10327.html -BuildRequires: glib2-devel -BuildRequires: mysql-devel >= 4.1.0 -BuildRequires: nagios-devel >= 2.1 -BuildRequires: pkgconfig -BuildRequires: rpm-perlprov -Requires: cacti >= 0.8.6h -Requires: nagios >= 2.1 +#Source0: http://downloads.sourceforge.net/gibtmirdas/npc-%{version}.tar.gz +Source0: npc-%{version}.tar.gz +# Source0-md5: 7b30302c544f10ed73cff406fda14499 +URL: https://trac.assembla.com/npc/ +BuildRequires: rpmbuild(macros) >= 1.553 +Requires: cacti >= 0.8.7b +Requires: cacti(pia) >= 2.0 +Requires: nagios >= 3.0 +Requires: php-common >= 4:%{php_min_version} +Requires: php-ctype +Requires: nagios-ndoutils >= 1.4b7 +Requires: php-date +Requires: php-iconv +Requires: php-json +Requires: php-mbstring +Requires: php-mysql +Requires: php-mysqli +Requires: php-pcre +Requires: php-session +Requires: php-simplexml +Requires: php-spl +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define cactidir /usr/share/cacti %define plugindir %{cactidir}/plugins/%{plugin} %define moduledir %{_libdir}/nagios/modules +%define _noautoreq pear + %description -Plugin for Cacti - A UI replacement for Nagios integrated into Cacti. +The purpose of NPC is to be a complete web based UI replacement to +Nagios while fully integrating into Cacti using the Cacti Plugin +Architecture. This integration will provide a single point of access +for trending and alert monitoring. %description -l pl.UTF-8 Wtyczka do Cacti - zamiennik interfejsu użytkownika dla Nagiosa zintegrowany z Cacti. %prep -%setup -q -n %{plugin} -%patch0 -p1 -%patch1 -p1 - -%build -cd neb -%{__cc} %{rpmcflags} -Wall -o inserter.o inserter.c -shared -I../include $(pkg-config glib-2.0 --cflags) $(mysql_config --cflags --libs) -fPIC +%setup -qc +mv %{plugin}/*.debug . +mv %{plugin}/build.xml . +mv %{plugin}/{README,LICENSE} . +%undos -f php README %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{plugindir},%{moduledir}} -install neb/inserter.o $RPM_BUILD_ROOT%{moduledir} -cp -a . $RPM_BUILD_ROOT%{plugindir} -rm -rf $RPM_BUILD_ROOT%{plugindir}/neb - -# Edit nagios.cfg and set: -# -# retain_state_information=0 -# event_broker_options=-1 -# broker_module=%{moduledir}/inserter.o - -# Setting retain_state_information=0 causes all hosts and services to -# go to a pending state until rechecked by Nagios. Without this setting -# the inserter module will never update any data in NPC. Its a minor -# inconvenience that I will try to fix in the inserter module. +install -d $RPM_BUILD_ROOT%{plugindir} +cp -a %{plugin}/* $RPM_BUILD_ROOT%{plugindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc TODO README +%doc README %{plugindir} -%attr(755,root,root) %{moduledir}/inserter.o -- 2.44.0