mirror of
https://github.com/timberjoegithub/grafana-statusmap.git
synced 2026-07-21 23:42:03 +00:00
Merge pull request #63 from flant/fix_then_for_5_x
Fix then for grafana 5.x before 5.4
This commit is contained in:
Ivan Mikheykin
@@ -0,0 +1,41 @@
|
||||
# Changelog
|
||||
|
||||
## v0.1.1
|
||||
|
||||
- Fix for annotations in grafana 5.x before 5.4
|
||||
|
||||
## v0.1.0
|
||||
|
||||
- Tested with Grafana 6.0.0
|
||||
- Tested with InfluxDB and Mysql datasources
|
||||
- Add initial support for display annotations
|
||||
- Add example for k8s statuses (thanks, @vrutkovs)
|
||||
- Fix hanging on big values
|
||||
- Fix horizontal spacing = 0
|
||||
- Fix for "Object doesn't support property or method 'remove'"
|
||||
- Fix card width for targets with different datapoints count
|
||||
|
||||
## v0.0.4
|
||||
|
||||
- Fix display of multivalues buckets as an empty cell
|
||||
|
||||
## v0.0.3
|
||||
|
||||
- Add solarized preset
|
||||
- Reorganize statuses editor for discrete mode
|
||||
- Separate options for vertical and horizontal spacing for cards
|
||||
- Add simple sort options for Y axis
|
||||
- Fix display null values as zero
|
||||
|
||||
## v0.0.2
|
||||
|
||||
- Install with GF_INSTALL_PLUGINS
|
||||
- Fix legend overlap
|
||||
- Fix colors for dark theme
|
||||
- Fix panel rendering timeout error
|
||||
|
||||
|
||||
## v0.0.1
|
||||
|
||||
- First public release
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ module.exports = (grunt) => {
|
||||
},
|
||||
pluginDef: {
|
||||
expand: true,
|
||||
src: ['plugin.json', 'README.md'],
|
||||
src: ['plugin.json', 'README.md', 'CHANGELOG.md'],
|
||||
dest: 'dist'
|
||||
}
|
||||
},
|
||||
|
||||
@@ -203,39 +203,7 @@ The first public release of this plugin has been fully made by [Flant](https://f
|
||||
|
||||
This plugin is based on "Heatmap" panel by Grafana and partly inspired by ideas from Carpet plot, Discrete panel, Status Panel, Status Dot, Status By Group.
|
||||
|
||||
#### Changelog
|
||||
|
||||
##### v0.1.0
|
||||
### CHANGELOG
|
||||
|
||||
- Tested with Grafana 6.0.0
|
||||
- Tested with InfluxDB and Mysql datasources
|
||||
- Add initial support for display annotations
|
||||
- Add example for k8s statuses (thanks, @vrutkovs)
|
||||
- Fix hanging on big values
|
||||
- Fix horizontal spacing = 0
|
||||
- Fix for "Object doesn't support property or method 'remove'"
|
||||
- Fix card width for targets with different datapoints count
|
||||
|
||||
##### v0.0.4
|
||||
|
||||
- Fix display of multivalues buckets as an empty cell
|
||||
|
||||
##### v0.0.3
|
||||
|
||||
- Add solarized preset
|
||||
- Reorganize statuses editor for discrete mode
|
||||
- Separate options for vertical and horizontal spacing for cards
|
||||
- Add simple sort options for Y axis
|
||||
- Fix display null values as zero
|
||||
|
||||
##### v0.0.2
|
||||
|
||||
- Install with GF_INSTALL_PLUGINS
|
||||
- Fix legend overlap
|
||||
- Fix colors for dark theme
|
||||
- Fix panel rendering timeout error
|
||||
|
||||
|
||||
##### v0.0.1
|
||||
|
||||
- First public release
|
||||
The latest changes can be found here: [CHANGELOG.md](https://github.com/flant/grafana-statusmap/blob/master/CHANGELOG.md)
|
||||
|
||||
Vendored
+41
@@ -0,0 +1,41 @@
|
||||
# Changelog
|
||||
|
||||
## v0.1.1
|
||||
|
||||
- Fix for annotations in grafana 5.x before 5.4
|
||||
|
||||
## v0.1.0
|
||||
|
||||
- Tested with Grafana 6.0.0
|
||||
- Tested with InfluxDB and Mysql datasources
|
||||
- Add initial support for display annotations
|
||||
- Add example for k8s statuses (thanks, @vrutkovs)
|
||||
- Fix hanging on big values
|
||||
- Fix horizontal spacing = 0
|
||||
- Fix for "Object doesn't support property or method 'remove'"
|
||||
- Fix card width for targets with different datapoints count
|
||||
|
||||
## v0.0.4
|
||||
|
||||
- Fix display of multivalues buckets as an empty cell
|
||||
|
||||
## v0.0.3
|
||||
|
||||
- Add solarized preset
|
||||
- Reorganize statuses editor for discrete mode
|
||||
- Separate options for vertical and horizontal spacing for cards
|
||||
- Add simple sort options for Y axis
|
||||
- Fix display null values as zero
|
||||
|
||||
## v0.0.2
|
||||
|
||||
- Install with GF_INSTALL_PLUGINS
|
||||
- Fix legend overlap
|
||||
- Fix colors for dark theme
|
||||
- Fix panel rendering timeout error
|
||||
|
||||
|
||||
## v0.0.1
|
||||
|
||||
- First public release
|
||||
|
||||
Vendored
+2
-34
@@ -203,39 +203,7 @@ The first public release of this plugin has been fully made by [Flant](https://f
|
||||
|
||||
This plugin is based on "Heatmap" panel by Grafana and partly inspired by ideas from Carpet plot, Discrete panel, Status Panel, Status Dot, Status By Group.
|
||||
|
||||
#### Changelog
|
||||
|
||||
##### v0.1.0
|
||||
### CHANGELOG
|
||||
|
||||
- Tested with Grafana 6.0.0
|
||||
- Tested with InfluxDB and Mysql datasources
|
||||
- Add initial support for display annotations
|
||||
- Add example for k8s statuses (thanks, @vrutkovs)
|
||||
- Fix hanging on big values
|
||||
- Fix horizontal spacing = 0
|
||||
- Fix for "Object doesn't support property or method 'remove'"
|
||||
- Fix card width for targets with different datapoints count
|
||||
|
||||
##### v0.0.4
|
||||
|
||||
- Fix display of multivalues buckets as an empty cell
|
||||
|
||||
##### v0.0.3
|
||||
|
||||
- Add solarized preset
|
||||
- Reorganize statuses editor for discrete mode
|
||||
- Separate options for vertical and horizontal spacing for cards
|
||||
- Add simple sort options for Y axis
|
||||
- Fix display null values as zero
|
||||
|
||||
##### v0.0.2
|
||||
|
||||
- Install with GF_INSTALL_PLUGINS
|
||||
- Fix legend overlap
|
||||
- Fix colors for dark theme
|
||||
- Fix panel rendering timeout error
|
||||
|
||||
|
||||
##### v0.0.1
|
||||
|
||||
- First public release
|
||||
The latest changes can be found here: [CHANGELOG.md](https://github.com/flant/grafana-statusmap/blob/master/CHANGELOG.md)
|
||||
|
||||
Vendored
+2
-2
@@ -25,8 +25,8 @@
|
||||
{"name": "Color mapping", "path": "img/color-mapping.png"},
|
||||
{"name": "Queries example", "path": "img/queries-example.png"}
|
||||
],
|
||||
"version": "0.1.0",
|
||||
"updated": "2019-03-11"
|
||||
"version": "0.1.1",
|
||||
"updated": "2019-03-22"
|
||||
},
|
||||
|
||||
"dependencies": {
|
||||
|
||||
Vendored
+7
-2
@@ -208,9 +208,14 @@ System.register(['app/plugins/sdk', 'lodash', 'app/core/core', 'app/core/utils/k
|
||||
* (but not wait for completion). This resolves
|
||||
* issue 11806.
|
||||
*/
|
||||
return _this.annotationsSrv.datasourcePromises.then(function (r) {
|
||||
// 5.x before 5.4 doesn't have dataPromises
|
||||
if ("undefined" !== typeof _this.annotationsSrv.datasourcePromises) {
|
||||
return _this.annotationsSrv.datasourcePromises.then(function (r) {
|
||||
return _get(StatusHeatmapCtrl.prototype.__proto__ || Object.getPrototypeOf(StatusHeatmapCtrl.prototype), 'issueQueries', _this).call(_this, datasource);
|
||||
});
|
||||
} else {
|
||||
return _get(StatusHeatmapCtrl.prototype.__proto__ || Object.getPrototypeOf(StatusHeatmapCtrl.prototype), 'issueQueries', _this).call(_this, datasource);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
_this.onDataReceived = function (dataList) {
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+2
-2
@@ -25,8 +25,8 @@
|
||||
{"name": "Color mapping", "path": "img/color-mapping.png"},
|
||||
{"name": "Queries example", "path": "img/queries-example.png"}
|
||||
],
|
||||
"version": "0.1.0",
|
||||
"updated": "2019-03-11"
|
||||
"version": "0.1.1",
|
||||
"updated": "2019-03-22"
|
||||
},
|
||||
|
||||
"dependencies": {
|
||||
|
||||
@@ -206,9 +206,14 @@ export class StatusHeatmapCtrl extends MetricsPanelCtrl {
|
||||
* (but not wait for completion). This resolves
|
||||
* issue 11806.
|
||||
*/
|
||||
return this.annotationsSrv.datasourcePromises.then(r => {
|
||||
// 5.x before 5.4 doesn't have dataPromises
|
||||
if ("undefined" !== typeof(this.annotationsSrv.datasourcePromises)) {
|
||||
return this.annotationsSrv.datasourcePromises.then(r => {
|
||||
return super.issueQueries(datasource);
|
||||
});
|
||||
} else {
|
||||
return super.issueQueries(datasource);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user