Changeset 112

Timestamp:

03/22/08 21:17:07 (5 years ago)

Author:

divagater

Message:

Various updates

Location:

trunk

Files:

• controllers/comments.php (modified) (1 diff)
• controllers/controller.php (modified) (1 diff)
• controllers/hosts.php (modified) (2 diffs)
• controllers/services.php (modified) (5 diffs)
• images/tab_npc.gif (modified) (previous)
• images/tab_npc_down.gif (added)
• js/src/monitoring/commandForms.js (modified) (11 diffs)
• js/src/monitoring/hosts/hostCommandMenu.js (modified) (3 diffs)
• js/src/monitoring/hosts/hostDetail.js (modified) (1 diff)
• js/src/monitoring/services/serviceCommandMenu.js (modified) (2 diffs)
• js/src/monitoring/services/serviceDetail.js (modified) (2 diffs)
• js/src/monitoring/services/services.js (modified) (1 diff)
• setup.php (modified) (1 diff)

trunk/controllers/comments.php

@@ -14 +14 @@
  * @version             $Id: $
  */
-
-require_once("include/auth.php");
 
 /**

trunk/controllers/controller.php

@@ -213 +213 @@
         'event_handler'                 => 'Event Handler', 
         'check_command'                 => 'Check Command', 
+        'command_line'                  => 'Command Line', 
         'normal_check_interval'         => 'Normal Check Interval', 
         'retry_check_interval'          => 'Retry Check Interval', 

trunk/controllers/hosts.php

@@ -15 +15 @@
  */
 
-require_once("include/auth.php");
-require_once("plugins/npc/controllers/comments.php");
+require_once($config["base_path"]."/plugins/npc/controllers/comments.php");
 
 /**
@@ -236 +235 @@
         if ($key == 'current_state') {
             $return = $cs[$results[$key]];
+            if ($results['problem_has_been_acknowledged']) {
+                $comments = new NpcCommentsController;
+                $string = $comments->getAck($results['host_object_id']);
+                $ack = preg_split("/\*\|\*/", $string);
+                $return = '<pre>' . $return . '   (Acknowledged by ' . $ack[0] . ')</pre>';
+            }
         }
 

trunk/controllers/services.php

@@ -15 +15 @@
  */
 
-require_once("include/auth.php");
-require_once("plugins/npc/controllers/comments.php");
+require_once($config["base_path"]."/plugins/npc/controllers/comments.php");
 
 /**
@@ -70 +69 @@
             'last_state_change',
             'check_command',
+            'command_line',
             'current_check_attempt',
             'last_check',
@@ -202 +202 @@
     }
 
-    function getPerfData($id) {
+    function getPerfData($id=null) {
+
+        $id = $this->id ? $this->id : $id;
 
         $q = new Doctrine_Pager(
             Doctrine_Query::create()
-                ->select('n.perfdata')
+                ->select('n.*')
                 ->from('NpcServicechecks n, NpcServices n2')
                     ->where('n.service_object_id = ? AND n2.service_object_id = n.service_object_id AND n.start_time'
@@ -254 +256 @@
         if ($key == 'current_state') {
             $return = $cs[$results[$key]];
+            if ($results['problem_has_been_acknowledged']) {
+                $comments = new NpcCommentsController;
+                $string = $comments->getAck($results['service_object_id']);
+                $ack = preg_split("/\*\|\*/", $string);
+                $return = '<pre>' . $return . '   (Acknowledged by ' . $ack[0] . ')</pre>';
+            }
         }
 
@@ -281 +289 @@
         }
 
+        // Add the full command as a tooltip
+        if ($key == 'command_line') {
+            $perf = $this->getPerfData($results['service_object_id']);
+            $return = $perf[0]['command_line'];
+        }
+
         if ($return == '' || !$return) {
             $return = 'NA';

trunk/js/src/monitoring/commandForms.js

@@ -88 +88 @@
             name: 'p_comment',
             xtype: 'htmleditor',
-            height:200,
+            height:150,
             width: 500
         },{
@@ -105 +105 @@
         closable: true,
         width:680,
-        height:400,
+        height:375,
         bodyStyle:'padding:5px;',
         items: form
@@ -557 +557 @@
     var cmd = 'SCHEDULE_' + type.toUpperCase() + '_DOWNTIME';
 
+    var title = 'Schedule Host Downtime - ' + host;
+
+    if (type == 'svc') {
+        title = 'Schedule Service Downtime - ' + host + ': ' + service;
+    }
+
     var sd = new Date();
     var ed = new Date();
@@ -636 +642 @@
                     valueField:'value',
                     forceSelection:true,
+                    labelStyle: 'cursor: help;',
+                    tooltipText: "Trigger the start of the downtime by the start of some other scheduled host or service downtime.",
                     listeners: {
                         expand: function(comboBox) {
                             comboBox.list.setWidth( 'auto' );
                             comboBox.innerList.setWidth( 'auto' );
+                        },
+                        render: function(o) {
+                            npc.setFormFieldTooltip(o);
                         }
                     },
@@ -662 +673 @@
                 name: 'p_stime',
                 value: startDate,
+                labelStyle: 'cursor: help;',
+                tooltipText: "Start time must be in the format 'YYYY-MM-DD HH:MM:SS'.",
                 listeners: {
                     change: function(comboBox) {
@@ -667 +680 @@
                         var d = new Date(v.replace(/-/g,' '));
                         form.form.setValues({p_start_time: d.format('U')});
+                    },
+                    render: function(o) {
+                        npc.setFormFieldTooltip(o);
                     }
                 },
@@ -675 +691 @@
                 name: 'p_etime',
                 value: endDate,
+                labelStyle: 'cursor: help;',
+                tooltipText: "End time must be in the format 'YYYY-MM-DD HH:MM:SS'.",
                 listeners: {
                     change: function(comboBox) {
@@ -680 +698 @@
                         var d = new Date(v.replace(/-/g,' '));
                         form.form.setValues({p_end_time: d.format('U')});
+                    },
+                    render: function(o) {
+                        npc.setFormFieldTooltip(o);
                     }
                 },
@@ -695 +716 @@
                     displayField:'name',
                     valueField:'value',
+                    labelStyle: 'cursor: help;',
+                    tooltipText: "Flexible downtime starts when the service enters a non-OK state (sometime between the start and end times you specified) and lasts as long as the duration of time you enter. Fixed downtime is starts and ands strictly based on start and end times provided. The duration field does not apply for fixed downtime.",
+                    listeners: {
+                        render: function(o) {
+                            npc.setFormFieldTooltip(o);
+                        }
+                    },
                     forceSelection:true,
                     mode: 'local',
@@ -710 +738 @@
                 fieldLabel: 'Duration (minutes)',
                 name: 'p_minutes',
+                value: 120,
                 width: 50,
                 listeners: {
@@ -766 +795 @@
 
     var win = new Ext.Window({
-        title:'Schedule Downtime',
+        title:title,
         layout:'fit',
         modal:true,
         closable: true,
         width:700,
-        height:500,
+        height:450,
         bodyStyle:'padding:5px;',
         items: form

trunk/js/src/monitoring/hosts/hostCommandMenu.js

@@ -20 +20 @@
                 handler: function(o) {
                     post.p_command = 'REMOVE_HOST_ACKNOWLEDGEMENT';
+                    post.p_host_name = host.host_name;
                     npc.doCommand(o.text+'?',post);
                 }
@@ -32 +33 @@
         }
     }
+
+    menu.add({
+        text: font + 'Re-schedule Next Check</b>',
+        handler: function() {
+            npc.scheduleNextCheck('host', host.host_name);
+        }
+    });
 
     a = host.active_checks_enabled ? 'Disable' : 'Enable';
@@ -59 +67 @@
         handler: function() {
             npc.sendCustomNotification('host', host.host_name);
-        }
-    });
-
-    menu.add({
-        text: font + 'Re-schedule Next Check</b>',
-        handler: function() {
-            npc.scheduleNextCheck('host', host.host_name);
         }
     });

trunk/js/src/monitoring/hosts/hostDetail.js

@@ -128 +128 @@
                         id: id + '-hn'
                     },{
-                        title: 'Downtime History',
+                        title: 'Scheduled Downtime History',
                         id: id + '-hd'
                     },{

trunk/js/src/monitoring/services/serviceCommandMenu.js

@@ -16 +16 @@
 
     if (service.current_state == 2) {
-        menu.add({
-            text: font + 'Acknowledge Problem</b>',
-            handler: function(o) {
-                npc.ackProblem('svc', service.host_name, service.service_description);
-            }
-        });
+        if (!service.problem_has_been_acknowledged) {
+            menu.add({
+                text: font + 'Acknowledge Problem</b>',
+                handler: function(o) {
+                    npc.ackProblem('svc', service.host_name, service.service_description);
+                }
+            });
+        } else {
+            menu.add({
+                text: font + 'Remove problem acknowledgement</b>',
+                handler: function(o) {
+                    post.p_command = 'REMOVE_SVC_ACKNOWLEDGEMENT';
+                    post.p_host_name = service.host_name;
+                    post.p_service_description = service.service_description;
+                    npc.doCommand(o.text+'?',post);
+                }
+            });
+        }
     }
+
+    menu.add({
+        text: font + 'Re-schedule Next Check</b>',
+        handler: function() {
+            npc.scheduleNextCheck('svc', service.host_name, service.service_description);
+        }
+    });
 
     a = service.active_checks_enabled ? 'Disable' : 'Enable';
@@ -50 +69 @@
         handler: function() {
             npc.sendCustomNotification('svc', service.host_name, service.service_description);
-        }
-    });
-
-    menu.add({
-        text: font + 'Re-schedule Next Check</b>',
-        handler: function() {
-            npc.scheduleNextCheck('svc', service.host_name, service.service_description);
         }
     });

trunk/js/src/monitoring/services/serviceDetail.js

@@ -184 +184 @@
                         id: id + '-sn'
                     },{
-                        title: 'Downtime History',
+                        title: 'Scheduled Downtime History',
                         id: id + '-sd'
                     },{
@@ -485 +485 @@
         header:"Comment",
         dataIndex:'comment_data',
-        width:400
+        width:500
     },{
         header:"Persistent",
         dataIndex:'is_persistent',
         renderer:npc.renderPersistent,
-        width:80
+        width:75
     },{
         header:"Type",

trunk/js/src/monitoring/services/services.js

@@ -97 +97 @@
         dataIndex:'last_state_change',
         renderer: npc.getDuration,
+        hidden:true,
         width:110
     },{

trunk/setup.php

@@ -1330 +1330 @@
         global $config;
         if (api_user_realm_auth('npc.php')) {
-                print '<a href="' . $config['url_path'] . 'plugins/npc/npc.php"><img src="' . $config['url_path'] 
-                    . 'plugins/npc/images/tab_npc.gif" alt="Nagios" align="absmiddle" border="0"></a>';
+            $cp = false;
+            if (basename($_SERVER["PHP_SELF"]) == "npc.php")
+                $cp = true;
+
+            print '<a href="' . $config['url_path'] . 'plugins/npc/npc.php"><img src="' . $config['url_path'] . 'plugins/npc/images/tab_npc' . ($cp ? "_down": "") . '.gif" alt="npc" align="absmiddle" border="0"></a>';
         }
         npc_check_upgrade ();