Adjsuted plugin.json to match panel type

mariusoe · mariusoe · commit 369809f4c159 · 2019-03-20T11:15:32.000+01:00
diff --git a/README.md b/README.md
@@ -46,10 +46,11 @@ To build a production build with minification: `yarn build`
 This plugin is using a modified version of the Vizeral library, thus you have to link the customized Vizceral version in order to build the plugin!
 
 1. Ensure that NodeJS and NPM is installed
-1. Clone the Vizceral fork
+1. Clone the Vizceral fork: `git clone https://github.com/NovatecConsulting/vizceral.git`
+1. Checkout the `flowmap` branch: `git checkout -b flowmap`
 1. Run inside the repository `npm link`
-1. Build it: `npm run dev`
-1. Go to the SDG-plugin directory and execute `npm link vizceral`
+1. Build it: `npm run build` (or `npm run dev` for development)
+1. Go to the flowmap-plugin directory and execute `npm link vizceral`
 
 #### Changelog
 
diff --git a/src/css/novatec-service-dependency-graph-panel.css b/src/css/novatec-service-dependency-graph-panel.css
diff --git a/src/graph/GraphGenerator.js b/src/graph/GraphGenerator.js
@@ -19,7 +19,7 @@ class GraphGenerator {
 			name: "INTERNET",
 			displayName: "INTERNET",
 			nodes: nodes,
-			layout: this.panelCtrl.panel.flowmapSettings.layout,
+			layout: this.panelCtrl.panel.sdgSettings.layout,
 			metadata: {},
 			class: "normal",
 			maxVolume: 10000,
@@ -249,7 +249,7 @@ class GraphGenerator {
 			if (!_.has(c, 'metadata')) {
 				c['metadata'] = {};
 			}
-			c.metadata['showStats'] = this.panelCtrl.panel.flowmapSettings.showConnectionStats;
+			c.metadata['showStats'] = this.panelCtrl.panel.sdgSettings.showConnectionStats;
 		});
 
 		return allConnections;
diff --git a/src/img/novatec_sdg_panel_logo.svg b/src/img/novatec_sdg_panel_logo.svg
diff --git a/src/module.ts b/src/module.ts
@@ -1,5 +1,5 @@
-import { FlowmapCtrl } from './flowmap_ctrl';
+import { ServiceDependencyGraphCtrl } from './service_dependency_graph_ctrl.ts';
 
 export {
-	FlowmapCtrl as PanelCtrl
+	ServiceDependencyGraphCtrl as PanelCtrl
 };
diff --git a/src/options_ctrl.ts b/src/options_ctrl.ts
@@ -61,7 +61,7 @@ export function optionsTab($q, uiSegmentSrv) {
 	return {
 		restrict: 'E',
 		scope: true,
-		templateUrl: 'public/plugins/novatec-flowmap-panel/partials/options.html',
+		templateUrl: 'public/plugins/novatec-service-dependency-graph-panel/partials/options.html',
 		controller: OptionsCtrl,
 	};
 }
diff --git a/src/partials/module.html b/src/partials/module.html
@@ -1,6 +1,6 @@
 <div class="clock-panel" ng-style="{height: ctrl.height}">
 
-    <div class="vizceral" id="nt-flowmap-container" ng-show="ctrl.dataAvailable()" style="width: 100%; height: 100%"></div>
+    <div class="vizceral" id="nt-sdg-container" ng-show="ctrl.dataAvailable()" style="width: 100%; height: 100%"></div>
 
     <div class="noData" ng-show="!ctrl.dataAvailable()">No data to show - the query returned no data.</div>
 
diff --git a/src/partials/options.html b/src/partials/options.html
@@ -73,30 +73,30 @@ <h5 class="section-heading">Data Mapping</h5>
 
 
         <div class="section gf-form-group">
-            <h5 class="section-heading">Flowmap Settings</h5>
+            <h5 class="section-heading">SDG Settings</h5>
 
             <div class="gf-form-inline">
-                <gf-form-switch class="gf-form" label="Show Connection Statistics" label-class="width-16" checked="ctrl.panel.flowmapSettings.showConnectionStats" on-change="ctrl.forceRender()"></gf-form-switch>
+                <gf-form-switch class="gf-form" label="Show Connection Statistics" label-class="width-16" checked="ctrl.panel.sdgSettings.showConnectionStats" on-change="ctrl.forceRender()"></gf-form-switch>
 
                 <label class="gf-form-label width-8">Layout</label>
-                <select class="input-small gf-form-input width-10" ng-model="ctrl.panel.flowmapSettings.layout" ng-change="ctrl.forceRender()">
+                <select class="input-small gf-form-input width-10" ng-model="ctrl.panel.sdgSettings.layout" ng-change="ctrl.forceRender()">
                     <option ng-repeat="variable in editor.getLayoutOptions()" value="{{variable}}">{{variable}}</option>
                 </select>
             </div>
         </div>
 
         <div class="section gf-form-group">
-            <h5 class="section-heading">Flowmap Style</h5>
+            <h5 class="section-heading">SDG Style</h5>
 
             <div class="gf-form-inline">
                 <label class="gf-form-label width-8">Healthy Color</label>
                 <span class="gf-form-label">
-                    <spectrum-picker ng-model="ctrl.panel.flowmapStyle.healthyColor" ng-change="ctrl.updateFlowmapStyle()"></spectrum-picker>
+                    <spectrum-picker ng-model="ctrl.panel.sdgStyle.healthyColor" ng-change="ctrl.updateSDGStyle()"></spectrum-picker>
                 </span>
 
                 <label class="gf-form-label width-8">Danger Color</label>
                 <span class="gf-form-label">
-                    <spectrum-picker ng-model="ctrl.panel.flowmapStyle.dangerColor" ng-change="ctrl.updateFlowmapStyle()"></spectrum-picker>
+                    <spectrum-picker ng-model="ctrl.panel.sdgStyle.dangerColor" ng-change="ctrl.updateSDGStyle()"></spectrum-picker>
                 </span>
             </div>
         </div>
diff --git a/src/plugin.json b/src/plugin.json
@@ -1,9 +1,9 @@
 {
   "type": "panel",
-  "name": "Novatec Flowmap",
-  "id": "novatec-flowmap-panel",
+  "name": "Service Dependency Graph",
+  "id": "novatec-service-dependency-graph-panel",
   "info": {
-    "description": "Flowmap panel for Grafana",
+    "description": "Service Dependency Graph panel for Grafana",
     "author": {
       "name": "Novatec Consulting GmbH",
       "url": "https://www.novatec-gmbh.de/"
@@ -13,17 +13,17 @@
       "panel"
     ],
     "logos": {
-      "small": "img/novatec_flowmap_panel_logo.svg",
-      "large": "img/novatec_flowmap_panel_logo.svg"
+      "small": "img/novatec_sdg_panel_logo.svg",
+      "large": "img/novatec_sdg_panel_logo.svg"
     },
     "links": [
       {
         "name": "Project site",
-        "url": "https://github.com/NovatecConsulting/grafana-flowmap-panel"
+        "url": "https://github.com/NovatecConsulting/novatec-service-dependency-graph-panel.git"
       },
       {
         "name": "Apache License",
-        "url": "https://github.com/NovatecConsulting/grafana-flowmap-panel/blob/master/LICENSE"
+        "url": "https://github.com/NovatecConsulting/grafana-service-dependency-graph-panel/blob/master/LICENSE"
       }
     ],
     "screenshots": [
@@ -33,7 +33,7 @@
       }
     ],
     "version": "0.0.1",
-    "updated": "2019-03-06"
+    "updated": "2019-03-20"
   },
   "dependencies": {
     "grafanaVersion": "5.x.x",
diff --git a/src/service_dependency_graph_ctrl.ts b/src/service_dependency_graph_ctrl.ts
@@ -1,13 +1,13 @@
 import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
 import _ from 'lodash';
 import { optionsTab } from './options_ctrl';
-import './css/novatec-flowmap-panel.css';
+import './css/novatec-service-dependency-graph-panel.css';
 import Vizceral from 'vizceral';
 import PreProcessor from './data/PreProcessor';
 
 import GraphGenerator from './graph/GraphGenerator'
 
-export class FlowmapCtrl extends MetricsPanelCtrl {
+export class ServiceDependencyGraphCtrl extends MetricsPanelCtrl {
 
 	static templateUrl = 'partials/module.html';
 
@@ -24,11 +24,11 @@ export class FlowmapCtrl extends MetricsPanelCtrl {
 			responseTimeExternalColumn: "response-time-external",
 			requestRateExternalColumn: "request-rate-external",
 		},
-		flowmapStyle: {
+		sdgStyle: {
 			healthyColor: 'rgb(87, 148, 242)',
 			dangerColor: 'rgb(184, 36, 36)'
 		},
-		flowmapSettings: {
+		sdgSettings: {
 			showConnectionStats: true,
 			layout: 'ltrTree'
 		}
@@ -60,17 +60,17 @@ export class FlowmapCtrl extends MetricsPanelCtrl {
 		return this.currentData != null && _.has(this.currentData, 'data') && this.currentData.data.length > 0;
 	}
 
-	updateFlowmapStyle() {
+	updateSDGStyle() {
 		if (this.vizceral) {
 			this.vizceral.updateStyles({
 				colorText: 'rgb(214, 214, 214)',
 				colorTextDisabled: 'rgb(129, 129, 129)',
 				colorTraffic: {
-					healthy: this.panel.flowmapStyle.healthyColor,
+					healthy: this.panel.sdgStyle.healthyColor,
 					normal: 'rgb(186, 213, 237)',
 					normalDonut: 'rgb(91, 91, 91)',
 					warning: 'rgb(268, 185, 73)',
-					danger: this.panel.flowmapStyle.dangerColor
+					danger: this.panel.sdgStyle.dangerColor
 				},
 				colorNormalDimmed: 'rgb(101, 117, 128)',
 				colorBackgroundDark: 'rgb(35, 35, 35)',
@@ -100,15 +100,15 @@ export class FlowmapCtrl extends MetricsPanelCtrl {
 
 	onRender(payload) {
 		if (!this.vizceral) {
-			var flowmapContainer = document.getElementById("nt-flowmap-container");
+			var sdgContainer = document.getElementById("nt-sdg-container");
 
-			if (flowmapContainer != null) {
-				flowmapContainer.innerHTML = '<canvas id="nt-flowmap-viz"></canvas>';
+			if (sdgContainer != null) {
+				sdgContainer.innerHTML = '<canvas id="nt-sdg-viz"></canvas>';
 			} else {
-				console.warn("Flowmap container cannot be found!");
+				console.warn("SDG container cannot be found!");
 			}
 
-			var vizContainer = <HTMLCanvasElement>document.getElementById("nt-flowmap-viz");
+			var vizContainer = <HTMLCanvasElement>document.getElementById("nt-sdg-viz");
 
 			if (vizContainer != null) {
 
@@ -128,11 +128,11 @@ export class FlowmapCtrl extends MetricsPanelCtrl {
 					colorText: 'rgb(214, 214, 214)',
 					colorTextDisabled: 'rgb(129, 129, 129)',
 					colorTraffic: {
-						healthy: this.panel.flowmapStyle.healthyColor,
+						healthy: this.panel.sdgStyle.healthyColor,
 						normal: 'rgb(186, 213, 237)',
 						normalDonut: 'rgb(91, 91, 91)',
 						warning: 'rgb(268, 185, 73)',
-						danger: this.panel.flowmapStyle.dangerColor
+						danger: this.panel.sdgStyle.dangerColor
 					},
 					colorNormalDimmed: 'rgb(101, 117, 128)',
 					colorBackgroundDark: 'rgb(35, 35, 35)',

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export function optionsTab($q, uiSegmentSrv) {`
`61`	`61`	`return {`
`62`	`62`	`restrict: 'E',`
`63`	`63`	`scope: true,`
`64`		`- templateUrl: 'public/plugins/novatec-flowmap-panel/partials/options.html',`
	`64`	`+ templateUrl: 'public/plugins/novatec-service-dependency-graph-panel/partials/options.html',`
`65`	`65`	`controller: OptionsCtrl,`
`66`	`66`	`};`
`67`	`67`	`}`