Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Compact version of open problem view, thanks TG (fixes #2933)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mxhash
mxhash committed Aug 3, 2012
1 parent 6126348 commit 4099731
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 71 deletions.
8 changes: 4 additions & 4 deletions app/modules/Api/config/views/host.xml
View file
Expand Up @@ -158,19 +158,19 @@
<![CDATA[
SELECT
o.object_id AS PROBLEMS_OBJECT_ID,
o.objecttype_id AS OBJECTTYPE_ID,
COALESCE(s.host_object_id, h.host_object_id) AS HOST_OBJECT_ID,
s.service_object_id AS SERVICE_OBJECT_ID,
i.instance_id AS INSTANCE_ID,
i.instance_name AS INSTANCE_NAME,
o.name1 AS HOST_NAME,
o.name2 AS SERVICE_NAME,
h.icon_image AS HOST_ICON_IMAGE,
s.icon_image AS SERVICE_ICON_IMAGE,
COALESCE(s.icon_image, h.icon_image) AS ICON_IMAGE,
COALESCE(hs.current_state,shs.current_state) AS HOST_CURRENT_STATE,
hs.output AS HOST_OUTPUT,
COALESCE(ss.last_state_change,hs.last_state_change) AS LAST_STATE_CHANGE,
COALESCE(ss.output, hs.output) AS OUTPUT,
hs.process_performance_data AS HOST_PROCESS_PERFORMANCE_DATA,
ss.current_state AS SERVICE_CURRENT_STATE,
ss.output AS SERVICE_OUTPUT,
hs.next_check AS HOST_NEXT_CHECK,
ss.next_check AS SERVICE_NEXT_CHECK
hs.last_check AS HOST_LAST_CHECK,
Expand Down
128 changes: 61 additions & 67 deletions app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml
View file
Expand Up @@ -87,9 +87,9 @@
Field decleration: What to display and how
-->
<fields>
<field name="host_icon">
<field name="icon">
<datasource>
<parameter name="field">HOST_ICON_IMAGE</parameter>
<parameter name="field">ICON_IMAGE</parameter>
</datasource>

<display>
Expand All @@ -112,62 +112,22 @@
<parameter name="arguments">
<parameter name="image">
<![CDATA[
<tpl if="host_icon == ''" />
<tpl if="objecttype_id == 1" />
<tpl if="icon == ''" />
images/icons/server.png
</tpl>
<tpl if="icon != ''" />
images/icinga/{icon}
</tpl>
</tpl>
<tpl if="host_icon != ''" />
images/icinga/{host_icon}
</tpl>
]]>
</parameter>
</parameter>
</parameter>
</parameter>
</display>

<filter>
<parameter name="enabled">false</parameter>
</filter>

<order>
<parameter name="enabled">false</parameter>
<parameter name="default">false</parameter>
</order>

</field>
<field name="service_icon">
<datasource>
<parameter name="field">SERVICE_ICON_IMAGE</parameter>
</datasource>

<display>
<parameter name="visible">true</parameter>
<parameter name="label"></parameter>
<parameter name="icon">icinga-icon-image</parameter>
<parameter name="width">25</parameter>
<parameter name="Ext.grid.Column">
<parameter name="menuDisabled">true</parameter>
<parameter name="fixed">true</parameter>
</parameter>
<parameter name="jsFunc">
<parameter>
<parameter name="namespace">Cronk.grid.ColumnRenderer</parameter>
<parameter name="function">columnImage</parameter>

<!-- renderer/gridevent[cellclick|celldblclick|...] -->
<parameter name="type">renderer</parameter>

<parameter name="arguments">
<parameter name="image">
<![CDATA[
<tpl if="service_icon == ''" />
<tpl if="objecttype_id == 2" />
<tpl if="icon == ''" />
images/icons/application-monitor.png
</tpl>
<tpl if="icon != ''" />
images/icinga/{icon}
</tpl>
</tpl>
<tpl if="service_icon != ''" />
images/icinga/{service_icon}
</tpl>
]]>
</parameter>
</parameter>
Expand All @@ -185,6 +145,7 @@
</order>

</field>

<field name="instance_name">
<datasource>
<parameter name="field">INSTANCE_NAME</parameter>
Expand Down Expand Up @@ -251,6 +212,34 @@
</order>
</field>

<field name="objecttype_id">
<datasource>
<parameter name="field">OBJECTTYPE_ID</parameter>
</datasource>

<display>
<parameter name="visible">false</parameter>
<parameter name="label">Type Id</parameter>
</display>

<filter>
<parameter name="enabled">true</parameter>

<!-- Filter configuration -->
<parameter name="type">extjs</parameter>
<parameter name="subtype">appkit.ext.filter.number</parameter>

<parameter name="no_operator">false</parameter>

<parameter name="field">OBJECTTYPE_ID</parameter>
</filter>

<order>
<parameter name="enabled">false</parameter>
<parameter name="default">false</parameter>
</order>
</field>

<field name="host_object_id">
<datasource>
<parameter name="field">HOST_OBJECT_ID</parameter>
Expand Down Expand Up @@ -520,14 +509,14 @@
</order>
</field>

<field name="host_output">
<field name="output">
<datasource>
<parameter name="field">HOST_OUTPUT</parameter>
<parameter name="field">OUTPUT</parameter>
</datasource>

<display>
<parameter name="visible">true</parameter>
<parameter name="label">Host output</parameter>
<parameter name="label">Check output</parameter>
<parameter name="width">300</parameter>
</display>

Expand All @@ -542,25 +531,30 @@
</order>
</field>

<field name="service_output">
<field name="last_state_change">
<datasource>
<parameter name="field">SERVICE_OUTPUT</parameter>
<parameter name="field">LAST_STATE_CHANGE</parameter>
</datasource>

<display>
<parameter name="visible">true</parameter>
<parameter name="label">Service output</parameter>
<parameter name="width">300</parameter>
<parameter name="label"><![CDATA[Last state change]]></parameter>

<!-- Let the agavi translation manager transform the date -->
<parameter name="userFunc">
<parameter name="model">Cronks.ColumnDisplay.Format</parameter>
<parameter name="method">agaviDateFormat</parameter>
</parameter>
</display>

<filter>
<parameter name="enabled">false</parameter>

</filter>

<order>
<parameter name="enabled">true</parameter>
<!-- <parameter name="field">A_NEW_FIELD_TO_SORT</parameter> -->
<parameter name="default">true</parameter>
<parameter name="order">DESC</parameter>
</order>
</field>

Expand All @@ -570,7 +564,7 @@
</datasource>

<display>
<parameter name="visible">true</parameter>
<parameter name="visible">false</parameter>
<parameter name="label"><![CDATA[Last <b>host</b> check]]></parameter>

<!-- Let the agavi translation manager transform the date -->
Expand All @@ -586,7 +580,7 @@

<order>
<parameter name="enabled">true</parameter>
<parameter name="default">true</parameter>
<parameter name="default">false</parameter>
<parameter name="order">DESC</parameter>
</order>
</field>
Expand All @@ -597,7 +591,7 @@
</datasource>

<display>
<parameter name="visible">true</parameter>
<parameter name="visible">false</parameter>
<parameter name="label"><![CDATA[Last <b>service</b> check]]></parameter>

<!-- Let the agavi translation manager transform the date -->
Expand All @@ -613,7 +607,7 @@

<order>
<parameter name="enabled">true</parameter>
<parameter name="default">true</parameter>
<parameter name="default">false</parameter>
<parameter name="order">DESC</parameter>
</order>
</field>
Expand Down

0 comments on commit 4099731

Please sign in to comment.