Skip to content

Instantly share code, notes, and snippets.

@alapidas
Created July 7, 2015 16:59
Show Gist options
  • Save alapidas/737d16a9e373884b9059 to your computer and use it in GitHub Desktop.
Save alapidas/737d16a9e373884b9059 to your computer and use it in GitHub Desktop.
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/resources/js/dynamicview.js svn/ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/resources/js/dynamicview.js
--- ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/resources/js/dynamicview.js 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/resources/js/dynamicview.js 2015-07-07 11:58:46.000000000 -0500
@@ -36,7 +36,8 @@ Ext.define("Zenoss.dynamicview.DynamicVi
viewName: 'service_view',
contextUid: null,
serverVars: {},
- flashVars: {elementID: config.id}
+ flashVars: {elementID: config.id},
+ height: '100%'
});
this._contextUid = config.contextUid;
@@ -54,23 +55,22 @@ Ext.define("Zenoss.dynamicview.DynamicVi
this._setSwfContext(this._contextUid);
},
_setSwfContext: function(uid) {
- if ( this.rendered && !this.hidden && this.swf) {
+ if (this.rendered && !this.hidden && this.swf) {
this.swf.dom.setContext(uid);
}
},
onSwfReady: function() {
- if ( this._contextUid ) {
+ if (this._contextUid) {
this._setSwfContext(this._contextUid);
}
},
initComponent: function() {
DV.DynamicViewComponent.superclass.initComponent.call(this);
this.addEvents('nodeclick');
-
this.on('nodeclick', this.onNodeClick, this);
},
onNodeClick: function(url, x, y) {
- if ( Ext.isDefined(Zenoss.inspector.show) ) {
+ if (Ext.isDefined(Zenoss.inspector.show)) {
Zenoss.inspector.show(url, x, y);
}
}
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/views.py svn/ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/views.py
--- ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/views.py 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/ZenPacks/zenoss/DynamicView/browser/views.py 2015-07-07 11:58:46.000000000 -0500
@@ -80,7 +80,6 @@ class ZenossData(object):
'label': entity.name,
'group': group.name,
}
-
if self._includeEvents:
#This attribute access queries ZEP for event severities
self._nodes[entity.id]['events'] = entity.events
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/.gitignore svn/ZenPacks.zenoss.DynamicView/dita/.gitignore
--- ZenPacks.zenoss.DynamicView/dita/.gitignore 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/.gitignore 1969-12-31 18:00:00.000000000 -0600
@@ -1,5 +0,0 @@
-#################
-## Oxygen
-#################
-out/
-temp/
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/DynamicView.ditamap svn/ZenPacks.zenoss.DynamicView/dita/DynamicView.ditamap
--- ZenPacks.zenoss.DynamicView/dita/DynamicView.ditamap 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/DynamicView.ditamap 1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:map" "map.dtd">
-<map>
- <title>DynamicView</title>
- <topicref href="topics/DynamicView.dita">
- <topicref href="topics/prerequisites.dita"/>
- <topicref href="topics/DynamicView_ref-Dynamic-View-of-Organizers.dita"/>
- <topicref href="topics/DynamicView_topic-Dynamic-View-of-Devices.dita">
- <topicref href="topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-Cisco-UCS-Devices.dita"/>
- <topicref href="topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-VMware-Hosts.dita"/>
- <topicref href="topics/DynamicView_topic-Dynamic-View-of-Devices_ref-Dynamic-View-of-Storage-Devices.dita"/>
- </topicref>
- <topicref href="topics/DynamicView_ref-Daemons.dita"/>
- </topicref>
-</map>
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/book.ditamap svn/ZenPacks.zenoss.DynamicView/dita/book.ditamap
--- ZenPacks.zenoss.DynamicView/dita/book.ditamap 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/book.ditamap 1969-12-31 18:00:00.000000000 -0600
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bookmap
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:bookmap" "bookmap.dtd">
-<bookmap>
- <booktitle>
- <mainbooktitle>Zenoss ZenPack</mainbooktitle>
- </booktitle>
- <bookmeta>
- <publisherinformation>
- <organization>Zenoss, Inc.</organization>
- </publisherinformation>
- <prodinfo>
- <prodname>Zenoss Service Dynamics</prodname>
- <vrmlist>
- <vrm version="4" release="2" modification="5"/>
- </vrmlist>
- </prodinfo>
- <bookrights>
- <copyrfirst>
- <year>2014</year>
- </copyrfirst>
- <bookowner>
- <organization>Zenoss, Inc., 11305 Four Points Drive, Bldg 1 - Suite 300, Austin, Texas 78726, U.S.A.</organization>
- </bookowner>
- </bookrights>
- <data name="trademarks">
- <data name="trademark">Zenoss and the Zenoss logo are trademarks or registered trademarks
- of Zenoss, Inc., in the United States and other countries. All other
- trademarks, logos, and service marks are the property of Zenoss or other
- third parties. Use of these marks is prohibited without the express
- written consent of Zenoss, Inc., or the third-party owner.</data>
- <data name="trademark">Amazon Web Services, AWS, Amazon Elastic Compute Cloud, and Amazon EC2 are trademarks
- of Amazon.com, Inc. or its affiliates in the United States and/or other countries.</data>
- <data name="trademark">Flash is a registered trademark of Adobe Systems Incorporated.</data>
- <data name="trademark">Oracle, the Oracle logo, Java, and MySQL are registered trademarks of the Oracle Corporation and/or its affiliates.</data>
- <data name="trademark">Linux is a registered trademark of Linus Torvalds.</data>
- <data name="trademark">SNMP Informant is a trademark of Garth K. Williams (Informant Systems, Inc.).</data>
- <data name="trademark">Sybase is a registered trademark of Sybase, Inc.</data>
- <data name="trademark">Tomcat is a trademark of the Apache Software Foundation.</data>
- <data name="trademark">VMware is a registered trademark or trademark of VMware, Inc. in the United States and/or other jurisdictions.</data>
- <data name="trademark">Windows is a registered trademark of Microsoft Corporation in the United States and other countries.</data>
- <data name="trademark">All other companies and products mentioned are trademarks and property of their respective owners.</data>
- </data>
- </bookmeta>
- <frontmatter>
- <mapref href="../../../../../docs.common/keydefs-misc.ditamap"/>
- <mapref href="../../../../../docs.common/keydefs-topics.ditamap"/>
- <mapref href="../../../../../docs.extmon/keydefs-topics.ditamap"/>
- </frontmatter>
-
- <chapter href="DynamicView.ditamap" format="ditamap"/>
-
-</bookmap>
Binary files ZenPacks.zenoss.DynamicView/dita/images/dynamicviewcontrols.png and svn/ZenPacks.zenoss.DynamicView/dita/images/dynamicviewcontrols.png differ
Binary files ZenPacks.zenoss.DynamicView/dita/images/dynamicviewgraph.png and svn/ZenPacks.zenoss.DynamicView/dita/images/dynamicviewgraph.png differ
Binary files ZenPacks.zenoss.DynamicView/dita/images/dynamicviewinspectorpanel.png and svn/ZenPacks.zenoss.DynamicView/dita/images/dynamicviewinspectorpanel.png differ
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="referenceid">
- <title>(DynamicView) Dynamic Service View</title>
- <shortdesc>The <zenpack>ZenPacks.zenoss.DynamicView</zenpack> ZenPack provides a dynamic visualization of system
- objects and their relationships to other objects.</shortdesc>
- <refbody>
- <section>
- <p>You can access the dynamic view from groups, systems, and locations. Depending on the object
- type, different relationships are illustrated. Each dynamic view shows related objects in a graph. Each object in
- that graph displays its associated event information.</p>
- <fig>
- <title>Dynamic Service View: Locations Graph</title>
- <image href="../images/dynamicviewgraph.png" width="4.5in" scalefit="yes"/>
- </fig>
- <p>When you click an object in the graph, the "inspector" panel
- appears. This panel provides detailed information about the object and
- links directly to it. Information that appears in the inspector depends on
- the object type selected.</p>
- <fig>
- <title>Dynamic Service View: Inspector Panel</title>
- <image href="../images/dynamicviewinspectorpanel.png" width="3in" scalefit="yes"/>
- </fig>
-
- <p>View controls appear to the right of the graph. These allow you to
- adjust your view:</p><ul>
- <li>
- <p><b>Overview</b> - Toggles display on
- and off of the graph overview illustration.</p>
- </li>
-
- <li>
- <p><b>Magnifier</b> - Toggles on and off
- the magnifier, which allows you to magnify selected portions of the
- graph.</p>
- </li>
-
- <li>
- <p><b>Zoom In</b> - Zooms in on the
- graph.</p>
- </li>
-
- <li>
- <p><b>Zoom Out </b>- Zooms out on the
- graph.</p>
- </li>
-
- <li>
- <p><b>Fit View</b> - Fits the graph to
- the browser page.</p>
- </li>
-
- <li>
- <p><b>Refresh</b> - Refreshes the
- graph.</p>
- </li>
- </ul>
- <fig>
- <title>Dynamic View: View Controls</title>
- <image href="../images/dynamicviewcontrols.png" width="4in" scalefit="yes"/>
- </fig>
- </section>
- </refbody>
-</reference>
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Daemons.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Daemons.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Daemons.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Daemons.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="d23e326">
- <title>Daemons</title>
- <refbody>
- <section>
- <p>This ZenPack adds the <cmdname>zenjserver</cmdname> daemon to <ph conkeyref="names/platform"/>.</p>
- <table>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Type</entry>
- <entry>Name</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><p>Display</p></entry>
- <entry><p><cmdname>zenjserver</cmdname></p></entry>
- </row>
- </tbody>
- </tgroup>
- </table></section></refbody></reference>
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Dynamic-View-of-Organizers.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Dynamic-View-of-Organizers.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Dynamic-View-of-Organizers.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Dynamic-View-of-Organizers.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="d23e113"><title>Dynamic View of Organizers</title><refbody><section><p>The dynamic view of organizers shows objects that can impact the
- status of the organizer, such as other organizers and devices. This view
- also shows relationships between devices and a virtual infrastructure,
- such as VMware or Cisco UCS objects monitored by the system, as well as
- storage information.</p><p>To access the dynamic view for an organizer (such as a group,
- system, or location):</p><ol>
- <li>
- <p>From Infrastructure &gt; Devices, select the organizer in the
- devices hierarchy.</p>
- </li>
-
- <li>
- <p>Click <b>Details</b>.</p>
- </li>
-
- <li>
- <p>Select Dynamic Service View.</p>
- </li>
- </ol></section></refbody></reference>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Enabling.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Enabling.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Enabling.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_ref-Enabling.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="d23e314"><title>Enabling</title><refbody><section><p>After installing the DynamicView ZenPack, you must restart the
- system. The <codeph outputclass="code">zenjserver</codeph> daemon must be running for dynamic
- views to be visible.</p></section></refbody></reference>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topic
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:topic" "topic.dtd">
-<topic id="d23e149"><title>Dynamic View of Devices</title><body><p>The dynamic view of devices shows the relationship between a
- device and monitored components.</p><p>To access the dynamic view for a device:</p><ol>
- <li>
- <p>From Infrastructure &gt; Devices, click a device in the device
- list.</p>
-
- <p>The device overview page appears.</p>
- </li>
-
- <li>
- <p>Select Dynamic Service View in the left panel.</p>
- </li>
- </ol></body></topic>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_ref-Dynamic-View-of-Storage-Devices.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_ref-Dynamic-View-of-Storage-Devices.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_ref-Dynamic-View-of-Storage-Devices.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_ref-Dynamic-View-of-Storage-Devices.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="d23e218"><title>Dynamic View of Storage Devices</title><refbody><section><p>On storage devices, such as NetApp Filers, there are two dynamic
- views:</p><ul>
- <li>
- <p><b>Physical Storage View</b> -
- Shows the device's storage enclosures and associated hard
- disks.</p>
- </li>
-
- <li>
- <p><b>Logical Storage View</b> -
- Shows the logical storage arrangement that the storage device
- presents, such as file systems and raid groups.</p>
- </li>
- </ul></section></refbody></reference>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-Cisco-UCS-Devices.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-Cisco-UCS-Devices.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-Cisco-UCS-Devices.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-Cisco-UCS-Devices.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topic
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:topic" "topic.dtd">
-<topic id="d23e178"><title>Dynamic View of Cisco UCS Devices</title><body><p>On Cisco UCS devices, the dynamic view shows the components and
- relationships that make up a Cisco UCS cluster.</p></body></topic>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-VMware-Hosts.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-VMware-Hosts.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-VMware-Hosts.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/DynamicView_topic-Dynamic-View-of-Devices_topic-Dynamic-View-of-VMware-Hosts.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topic
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:topic" "topic.dtd">
-<topic id="d23e188"><title>Dynamic View of VMware Hosts</title><body><p>On VMware Hosts (ESX servers), the dynamic view shows the
- relative VMware elements that are connected to the host, such
- as:</p><ul>
- <li>
- <p>VMs that currently are running on the Host</p>
- </li>
-
- <li>
- <p>Data stores that are mounted by the Host</p>
- </li>
-
- <li>
- <p>Clusters to which the Host belongs</p>
- </li>
- </ul></body></topic>
\ No newline at end of file
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/dita/topics/prerequisites.dita svn/ZenPacks.zenoss.DynamicView/dita/topics/prerequisites.dita
--- ZenPacks.zenoss.DynamicView/dita/topics/prerequisites.dita 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/dita/topics/prerequisites.dita 1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE reference
- PUBLIC "urn:pubid:zenoss.com:doctypes:dita:dtd:reference" "reference.dtd">
-<reference id="d23e246"><title>Prerequisites</title><refbody><section><table>
- <tgroup align="left" cols="2">
- <thead>
- <row>
- <entry>Prerequisite</entry>
-
- <entry>Restriction</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry><p>Product</p></entry>
-
- <entry><p><ph conkeyref="names/platform"/> 4.x, Zenoss 3.0 or
- higher</p></entry>
- </row>
-
- <row>
- <entry><p>Required ZenPacks</p></entry>
-
- <entry><p>ZenPacks.zenoss.DynamicView</p></entry>
- </row>
-
- <row>
- <entry>Other</entry>
-
- <entry>Oracle JRE 1.5 or later, Flash-enabled Web
- browser</entry>
- </row>
- </tbody>
- </tgroup>
- </table></section></refbody></reference>
diff '--exclude=.git' '--exclude=.svn' -Nurp ZenPacks.zenoss.DynamicView/setup.py svn/ZenPacks.zenoss.DynamicView/setup.py
--- ZenPacks.zenoss.DynamicView/setup.py 2015-07-07 11:59:19.000000000 -0500
+++ svn/ZenPacks.zenoss.DynamicView/setup.py 2015-07-07 11:58:42.000000000 -0500
@@ -3,7 +3,7 @@
# or saved. Do not modify them directly here.
# NB: PACKAGES is deprecated
NAME = "ZenPacks.zenoss.DynamicView"
-VERSION = "1.2.1.1"
+VERSION = "1.2.2"
AUTHOR = "Zenoss"
LICENSE = ""
NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment