Changeset 117

Timestamp:

03/25/08 13:06:39 (5 years ago)

Author:

divagater

Message:

Added graph icon and handling for mapped graphs. Only implemented on the service list so far

Location:

trunk

Files:

• controllers/services.php (modified) (2 diffs)
• images/icons/chart_bar.png (added)
• images/tab_npc.gif (modified) (previous)
• js/src/monitoring/hosts/hostgroupGrid.js (modified) (1 diff)
• js/src/monitoring/hosts/hostgroupOverview.js (modified) (1 diff)
• js/src/monitoring/services/servicegroupGrid.js (modified) (1 diff)
• js/src/monitoring/services/servicegroupOverview.js (modified) (1 diff)
• js/src/monitoring/services/services.js (modified) (6 diffs)
• models/NpcServices.php (modified) (1 diff)
• models/NpcServicestatus.php (modified) (1 diff)

trunk/controllers/services.php

@@ -183 +183 @@
                         .'o.name1 AS host_name,'
                         .'o.name2 AS service_description,'
+                        .'g.local_graph_id,'
                         .'ss.*')
                 ->from('NpcServicestatus ss')
@@ -188 +189 @@
                 ->leftJoin('ss.Service s')
                 ->leftJoin('ss.Instance i')
+                ->leftJoin('ss.Graph g')
                 ->where("$where")
                 ->orderby( 'i.instance_name ASC, host_name ASC, service_description ASC' ),

trunk/js/src/monitoring/hosts/hostgroupGrid.js

@@ -148 +148 @@
     tab.addListener(listeners);
 
-    grid.on('rowclick', npc.hostGridClick);
+    // Double click action
+    grid.on('rowdblclick', npc.hostGridClick);
 
+    // Right click action
+    grid.on('rowcontextmenu', npc.hostContextMenu);
 };

trunk/js/src/monitoring/hosts/hostgroupOverview.js

@@ -167 +167 @@
     tab.addListener(listeners);
 
-    grid.on('rowclick', hgOverviewClick);
+    grid.on('rowdblclick', hgOverviewClick);
+
+    // Right click action
+    grid.on('rowcontextmenu', npc.hostContextMenu);
 
     function hgOverviewClick(grid, rowIndex, e) {

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

@@ -161 +161 @@
     tab.addListener(listeners);
 
-    grid.on('rowclick', npc.serviceGridClick);
+    // Double click action
+    grid.on('rowdblclick', npc.serviceGridClick);
 
+    // Right click action
+    grid.on('rowcontextmenu', npc.serviceContextMenu);
 };

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

@@ -167 +167 @@
     tab.addListener(listeners);
 
-    grid.on('rowclick', sgOverviewClick);
+    grid.on('rowdblclick', sgOverviewClick);
+
+    // Right click action
+    grid.on('rowcontextmenu', npc.serviceContextMenu);
 
     function sgOverviewClick(grid, rowIndex, e) {

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

@@ -41 +41 @@
     };
 
+    function renderGraphIcon(val, p, record){
+        var icon = '';
+        if (val) {
+            // <img id="graph'+val+'" src="/graph_image.php?action=view&local_graph_id='+val+'&rra_id=1" style="position:absolute;left:0;top:0;"/>
+            icon = '<img src="images/icons/chart_bar.png">';
+        }
+        return String.format('{0}', icon);
+    };
+
     var store = new Ext.data.GroupingStore({
         url:url,
@@ -49 +58 @@
             root:'data'
         }, [
-            'host_object_id',
+            'instance_name',
+            {name: 'host_object_id', type: 'int'},
             'host_name',
-            'service_id',
-            'service_object_id',
+            {name: 'service_object_id', type: 'int'},
+            {name: 'local_graph_id', type: 'int'},
             'service_description',
             'acknowledgement',
@@ -82 +92 @@
         dataIndex:'current_state',
         renderer:npc.serviceStatusImage,
+        width:30
+    },{
+        header:"Graph",
+        dataIndex:'local_graph_id',
+        renderer:renderGraphIcon,
+        width:30
+    },{
+        header:"Instance",
+        dataIndex:'instance_name',
+        hidden:true,
         width:45
     },{
@@ -87 +107 @@
         dataIndex:'last_check',
         renderer: npc.formatDate,
-        width:110
+        width:100
     },{
         header:"Next Check",
         dataIndex:'next_check',
         renderer: npc.formatDate,
-        width:110
+        width:100
     },{
         header:"Duration",
@@ -119 +139 @@
         id: id + '-grid',
         autoHeight:true,
-        autoExpandColumn: 'service_description',
+        autoExpandColumn: 'plugin_output',
         store:store,
         autoScroll: true,
@@ -184 +204 @@
     // Right click action
     grid.on('rowcontextmenu', npc.serviceContextMenu);
+
+    // If the graph icon is clicked popup the associated graph
+    grid.on('cellclick', function(grid, rowIndex, columnIndex) {
+        var record = grid.getStore().getAt(rowIndex);
+        var fieldName = grid.getColumnModel().getDataIndex(columnIndex);
+        var data = record.get(fieldName);
+
+        if (fieldName == 'local_graph_id' && !Ext.getCmp('serviceGraph'+data)) {
+            var win = new Ext.Window({
+                title:record.data.host_name + ': ' + record.data.service_description,
+                id:'serviceGraph'+data,
+                layout:'fit',
+                modal:false,
+                closable: true,
+                html: '<img src="/graph_image.php?action=view&local_graph_id='+data+'&rra_id=1">',
+                width:600
+            }).show();
+        }
+    });
 };

trunk/models/NpcServices.php

@@ -34 +34 @@
         $this->hasOne('NpcHoststatus as Hoststatus', array('local' => 'host_object_id', 'foreign' => 'host_object_id'));
         $this->hasOne('NpcServicestatus as Status', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));
+        $this->hasOne('NpcServiceGraphs as Graph', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));
         $this->hasMany('NpcComments as Comment', array('local' => 'service_object_id', 'foreign' => 'object_id'));
         $this->hasMany('NpcServicechecks as Check', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));

trunk/models/NpcServicestatus.php

@@ -8 +8 @@
         $this->hasOne('NpcObjects as Object', array('local' => 'service_object_id', 'foreign' => 'object_id'));
         $this->hasOne('NpcServices as Service', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));
-        //$this->hasMany('NpcServicegroupMembers as ServicegroupMembers', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));
+        $this->hasOne('NpcServiceGraphs as Graph', array('local' => 'service_object_id', 'foreign' => 'service_object_id'));
         $this->hasMany('NpcServicegroups as Servicegroups', array('local' => 'service_object_id', 'foreign' => 'servicegroup_id', 'refClass' => 'NpcServicegroupMembers'));
     }