4 Commits
Author SHA1 Message Date
Ivan MikheykinandGitHub 012bcac0ef Merge pull request #130 from flant/fix_null_object
fix: proper fallback to string event for renderComplete
2020-08-28 17:59:44 +03:00
Ivan Mikheykin f037ad082e fix: proper fallback to string event for renderComplete 2020-08-28 17:58:43 +03:00
Ivan MikheykinandGitHub 9a2e4a394e Merge pull request #122 from flant/fix_0_3_2
fix: plugin.json fields and relative links in README.md
2020-08-13 14:35:30 +03:00
Ivan Mikheykin 4bd3ecbcf2 fix: plugin.json fields and relative links in README.md 2020-08-13 14:23:25 +03:00
7 changed files with 19 additions and 18 deletions
+4 -4
View File
@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a
#### Pagination #### Pagination
![Pagination controls](src/img/pagination-graph.png) ![Pagination controls](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/pagination-graph.png)
__Enable pagination__ toggles pagination controls on graph. __Enable pagination__ toggles pagination controls on graph.
@@ -192,7 +192,7 @@ __Rows per page__ a number of rows to display on graph.
#### Tooltip #### Tooltip
![Tooltip in frozen state](src/img/tooltip-frozen.png) ![Tooltip in frozen state](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-frozen.png)
__Show tooltip__ toggles tooltip display on mouse over buckets. __Show tooltip__ toggles tooltip display on mouse over buckets.
@@ -204,7 +204,7 @@ __Items__ is a list of definitions to display URLs in tooltip.
Each URL has a template, icon, label and formating options: lowercase and date format for variables. Each URL has a template, icon, label and formating options: lowercase and date format for variables.
![Tooltip items editor](src/img/tooltip-editor.png) ![Tooltip items editor](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-editor.png)
## Development ## Development
@@ -215,7 +215,7 @@ the directory containing Statusmap plugin):
docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \ docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \
-p 3000:3000 --name grafana.docker \ -p 3000:3000 --name grafana.docker \
--env=GF_USERS_DEFAULT_THEME=light \ --env=GF_USERS_DEFAULT_THEME=light \
grafana/grafana:5.1.3 grafana/grafana:7.1.3
``` ```
This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile
+4 -4
View File
@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a
#### Pagination #### Pagination
![Pagination controls](src/img/pagination-graph.png) ![Pagination controls](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/pagination-graph.png)
__Enable pagination__ toggles pagination controls on graph. __Enable pagination__ toggles pagination controls on graph.
@@ -192,7 +192,7 @@ __Rows per page__ a number of rows to display on graph.
#### Tooltip #### Tooltip
![Tooltip in frozen state](src/img/tooltip-frozen.png) ![Tooltip in frozen state](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-frozen.png)
__Show tooltip__ toggles tooltip display on mouse over buckets. __Show tooltip__ toggles tooltip display on mouse over buckets.
@@ -204,7 +204,7 @@ __Items__ is a list of definitions to display URLs in tooltip.
Each URL has a template, icon, label and formating options: lowercase and date format for variables. Each URL has a template, icon, label and formating options: lowercase and date format for variables.
![Tooltip items editor](src/img/tooltip-editor.png) ![Tooltip items editor](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-editor.png)
## Development ## Development
@@ -215,7 +215,7 @@ the directory containing Statusmap plugin):
docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \ docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \
-p 3000:3000 --name grafana.docker \ -p 3000:3000 --name grafana.docker \
--env=GF_USERS_DEFAULT_THEME=light \ --env=GF_USERS_DEFAULT_THEME=light \
grafana/grafana:5.1.3 grafana/grafana:7.1.3
``` ```
This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile
+2 -3
View File
@@ -157,8 +157,7 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
_export("renderComplete", renderComplete = { _export("renderComplete", renderComplete = {
name: 'statusmap-render-complete' name: 'statusmap-render-complete'
}); // eventFactory('statusmap-render-complete'); });
_export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl = _export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl =
/*#__PURE__*/ /*#__PURE__*/
@@ -267,7 +266,7 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
CoreEvents.fallbackToStringEvents(); CoreEvents.fallbackToStringEvents();
PanelEvents.fallbackToStringEvents(); PanelEvents.fallbackToStringEvents();
_export("renderComplete", renderComplete = renderComplete.name); _export("renderComplete", renderComplete = 'statusmap-render-complete');
} }
migratePanelConfig(_this.panel); migratePanelConfig(_this.panel);
+1 -1
View File
File diff suppressed because one or more lines are too long
+3 -2
View File
@@ -24,11 +24,12 @@
{"name": "Color mapping", "path": "img/color-mapping.png"}, {"name": "Color mapping", "path": "img/color-mapping.png"},
{"name": "Queries example", "path": "img/queries-example.png"} {"name": "Queries example", "path": "img/queries-example.png"}
], ],
"version": "0.3.1", "version": "0.3.2",
"updated": "2020-07-21" "updated": "2020-08-13"
}, },
"dependencies": { "dependencies": {
"grafanaDependency": ">=5.4.3",
"grafanaVersion": "5.4.x", "grafanaVersion": "5.4.x",
"plugins": [ ] "plugins": [ ]
} }
+2 -2
View File
@@ -63,7 +63,7 @@ loadPluginCss({
light: 'plugins/flant-statusmap-panel/css/statusmap.light.css' light: 'plugins/flant-statusmap-panel/css/statusmap.light.css'
}); });
export var renderComplete:any = {name:'statusmap-render-complete'}; // eventFactory('statusmap-render-complete'); export var renderComplete:any = {name:'statusmap-render-complete'};
class StatusHeatmapCtrl extends MetricsPanelCtrl { class StatusHeatmapCtrl extends MetricsPanelCtrl {
static templateUrl = 'module.html'; static templateUrl = 'module.html';
@@ -150,7 +150,7 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){ if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
CoreEvents.fallbackToStringEvents(); CoreEvents.fallbackToStringEvents();
PanelEvents.fallbackToStringEvents(); PanelEvents.fallbackToStringEvents();
renderComplete = renderComplete.name; renderComplete = 'statusmap-render-complete';
} }
migratePanelConfig(this.panel); migratePanelConfig(this.panel);
+3 -2
View File
@@ -24,11 +24,12 @@
{"name": "Color mapping", "path": "img/color-mapping.png"}, {"name": "Color mapping", "path": "img/color-mapping.png"},
{"name": "Queries example", "path": "img/queries-example.png"} {"name": "Queries example", "path": "img/queries-example.png"}
], ],
"version": "0.3.1", "version": "0.3.2",
"updated": "2020-07-21" "updated": "2020-08-13"
}, },
"dependencies": { "dependencies": {
"grafanaDependency": ">=5.4.3",
"grafanaVersion": "5.4.x", "grafanaVersion": "5.4.x",
"plugins": [ ] "plugins": [ ]
} }