mirror of
https://github.com/timberjoegithub/grafana-statusmap.git
synced 2026-07-21 23:42:03 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Ivan MikheykinandGitHub
|
9a2e4a394e | ||
|
Ivan Mikheykin
|
4bd3ecbcf2 | ||
|
Ivan MikheykinandGitHub
|
4b7d111cd6 | ||
|
Ivan Mikheykin
|
80725f6cd5 | ||
|
Ivan MikheykinandGitHub
|
3e37a0c3cc | ||
|
Ivan Mikheykin
|
a4d48eb591 | ||
|
Ivan MikheykinandGitHub
|
b96d205787 | ||
|
dependabot[bot]andGitHub
|
bd30626721 |
@@ -1,5 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v0.3.1
|
||||||
|
|
||||||
|
- Fix to work in Grafana 7.1.0
|
||||||
|
|
||||||
## v0.3.0
|
## v0.3.0
|
||||||
|
|
||||||
- Tooltip freeze on click
|
- Tooltip freeze on click
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
* Tested with Grafana:
|
* Tested with Grafana:
|
||||||
- 5.4.3
|
- 5.4.3
|
||||||
- 6.3, 6.6, 6.7
|
- 6.3, 6.6, 6.7
|
||||||
- 7.0
|
- 7.0, 7.1
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a
|
|||||||
|
|
||||||
#### Pagination
|
#### Pagination
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
__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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
__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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 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
|
||||||
|
|||||||
Vendored
+4
@@ -1,5 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v0.3.1
|
||||||
|
|
||||||
|
- Fix to work in Grafana 7.1.0
|
||||||
|
|
||||||
## v0.3.0
|
## v0.3.0
|
||||||
|
|
||||||
- Tooltip freeze on click
|
- Tooltip freeze on click
|
||||||
|
|||||||
Vendored
+5
-5
@@ -28,7 +28,7 @@
|
|||||||
* Tested with Grafana:
|
* Tested with Grafana:
|
||||||
- 5.4.3
|
- 5.4.3
|
||||||
- 6.3, 6.6, 6.7
|
- 6.3, 6.6, 6.7
|
||||||
- 7.0
|
- 7.0, 7.1
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a
|
|||||||
|
|
||||||
#### Pagination
|
#### Pagination
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
__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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
__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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 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
|
||||||
|
|||||||
Vendored
+2
-4
@@ -163,21 +163,20 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
|
|||||||
_export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl =
|
_export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl =
|
||||||
/*#__PURE__*/
|
/*#__PURE__*/
|
||||||
function (_MetricsPanelCtrl) {
|
function (_MetricsPanelCtrl) {
|
||||||
StatusHeatmapCtrl.$inject = ["$scope", "$injector", "timeSrv", "annotationsSrv", "$window", "datasourceSrv", "variableSrv", "templateSrv"];
|
StatusHeatmapCtrl.$inject = ["$scope", "$injector", "annotationsSrv"];
|
||||||
|
|
||||||
_inherits(StatusHeatmapCtrl, _MetricsPanelCtrl);
|
_inherits(StatusHeatmapCtrl, _MetricsPanelCtrl);
|
||||||
|
|
||||||
// TODO remove this transient variable: use ng-model-options="{ getterSetter: true }"
|
// TODO remove this transient variable: use ng-model-options="{ getterSetter: true }"
|
||||||
|
|
||||||
/** @ngInject */
|
/** @ngInject */
|
||||||
function StatusHeatmapCtrl($scope, $injector, timeSrv, annotationsSrv, $window, datasourceSrv, variableSrv, templateSrv) {
|
function StatusHeatmapCtrl($scope, $injector, annotationsSrv) {
|
||||||
var _this;
|
var _this;
|
||||||
|
|
||||||
_classCallCheck(this, StatusHeatmapCtrl);
|
_classCallCheck(this, StatusHeatmapCtrl);
|
||||||
|
|
||||||
_this = _possibleConstructorReturn(this, _getPrototypeOf(StatusHeatmapCtrl).call(this, $scope, $injector));
|
_this = _possibleConstructorReturn(this, _getPrototypeOf(StatusHeatmapCtrl).call(this, $scope, $injector));
|
||||||
_this.annotationsSrv = annotationsSrv;
|
_this.annotationsSrv = annotationsSrv;
|
||||||
_this.variableSrv = variableSrv;
|
|
||||||
|
|
||||||
_defineProperty(_assertThisInitialized(_this), "data", void 0);
|
_defineProperty(_assertThisInitialized(_this), "data", void 0);
|
||||||
|
|
||||||
@@ -312,7 +311,6 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
|
|||||||
};
|
};
|
||||||
_this.annotations = [];
|
_this.annotations = [];
|
||||||
_this.annotationsSrv = annotationsSrv;
|
_this.annotationsSrv = annotationsSrv;
|
||||||
_this.timeSrv = timeSrv;
|
|
||||||
|
|
||||||
_this.events.on(PanelEvents.render, _this.onRender.bind(_assertThisInitialized(_this)));
|
_this.events.on(PanelEvents.render, _this.onRender.bind(_assertThisInitialized(_this)));
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-3
@@ -81,9 +81,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="gf-form">
|
<div class="gf-form">
|
||||||
<label class="gf-form-label">
|
<label class="gf-form-label">
|
||||||
<a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
|
<i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
|
||||||
<i class="fa fa-trash"/>
|
|
||||||
</a>
|
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Vendored
+3
-2
@@ -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.0",
|
"version": "0.3.2",
|
||||||
"updated": "2020-07-14"
|
"updated": "2020-08-13"
|
||||||
},
|
},
|
||||||
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"grafanaDependency": ">=5.4.3",
|
||||||
"grafanaVersion": "5.4.x",
|
"grafanaVersion": "5.4.x",
|
||||||
"plugins": [ ]
|
"plugins": [ ]
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+4
-4
@@ -3580,7 +3580,7 @@
|
|||||||
},
|
},
|
||||||
"chalk": {
|
"chalk": {
|
||||||
"version": "1.1.3",
|
"version": "1.1.3",
|
||||||
"resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
|
||||||
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
|
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -7794,9 +7794,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lodash": {
|
"lodash": {
|
||||||
"version": "4.17.15",
|
"version": "4.17.19",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
|
||||||
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
|
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
|
||||||
},
|
},
|
||||||
"lodash.memoize": {
|
"lodash.memoize": {
|
||||||
"version": "4.1.2",
|
"version": "4.1.2",
|
||||||
|
|||||||
+1
-1
@@ -56,7 +56,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"d3": "4.13.0",
|
"d3": "4.13.0",
|
||||||
"d3-scale-chromatic": "1.5.0",
|
"d3-scale-chromatic": "1.5.0",
|
||||||
"lodash": "4.17.15",
|
"lodash": "4.17.19",
|
||||||
"moment": "2.24.0"
|
"moment": "2.24.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-3
@@ -144,7 +144,7 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** @ngInject */
|
/** @ngInject */
|
||||||
constructor($scope: any, $injector: auto.IInjectorService, timeSrv, private annotationsSrv: AnnotationsSrv, $window, datasourceSrv, public variableSrv: any, templateSrv) {
|
constructor($scope: any, $injector: auto.IInjectorService, private annotationsSrv: AnnotationsSrv) {
|
||||||
super($scope, $injector);
|
super($scope, $injector);
|
||||||
|
|
||||||
if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
|
if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
|
||||||
@@ -197,8 +197,6 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
|
|||||||
this.annotations = [];
|
this.annotations = [];
|
||||||
this.annotationsSrv = annotationsSrv;
|
this.annotationsSrv = annotationsSrv;
|
||||||
|
|
||||||
this.timeSrv = timeSrv;
|
|
||||||
|
|
||||||
this.events.on(PanelEvents.render, this.onRender.bind(this));
|
this.events.on(PanelEvents.render, this.onRender.bind(this));
|
||||||
this.events.on(PanelEvents.dataReceived, this.onDataReceived.bind(this));
|
this.events.on(PanelEvents.dataReceived, this.onDataReceived.bind(this));
|
||||||
this.events.on(PanelEvents.dataError, this.onDataError.bind(this));
|
this.events.on(PanelEvents.dataError, this.onDataError.bind(this));
|
||||||
|
|||||||
@@ -81,9 +81,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="gf-form">
|
<div class="gf-form">
|
||||||
<label class="gf-form-label">
|
<label class="gf-form-label">
|
||||||
<a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
|
<i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
|
||||||
<i class="fa fa-trash"/>
|
|
||||||
</a>
|
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+3
-2
@@ -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.0",
|
"version": "0.3.2",
|
||||||
"updated": "2020-07-14"
|
"updated": "2020-08-13"
|
||||||
},
|
},
|
||||||
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"grafanaDependency": ">=5.4.3",
|
||||||
"grafanaVersion": "5.4.x",
|
"grafanaVersion": "5.4.x",
|
||||||
"plugins": [ ]
|
"plugins": [ ]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user