Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Change README
  Implement changes for 5.1
  Increment to 0.3.5
  Fully support 5.0
  • Loading branch information
DeanF committed Feb 23, 2017
2 parents eefd321 + ae3e4ac commit a341bee
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bin/kibana plugin -i health_metric_vis -u https://github.com/DeanF/health_metric
```
For Kibana 5:
```bash
kibana-plugin install https://github.com/DeanF/health_metric_vis/releases/download/v0.3.4/health_metric_vis-${KIBANA_VERSION}.zip
kibana-plugin install https://github.com/DeanF/health_metric_vis/releases/download/v0.3.5/health_metric_vis-${KIBANA_VERSION}.zip
```


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "health_metric_vis",
"version": "0.3.4",
"version": "0.3.5",
"kibana": {
"version": "{VERSION}"
},
Expand Down
1 change: 1 addition & 0 deletions public/health_metric_vis.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function HealthMetricVisProvider(Private) {
},
editor: require('plugins/health_metric_vis/health_metric_vis_params.html')
},
implementsRenderComplete: true,
schemas: new Schemas([
{
group: 'metrics',
Expand Down
11 changes: 2 additions & 9 deletions public/health_metric_vis_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,11 @@ module.controller('KbnHealthMetricVisController', function ($scope, Private) {
});
};

$scope.$watch('esResponse', function (resp) {
$scope.$watchMulti(['esResponse', 'vis.params'], function ([resp]) {
if (resp) {
metrics.length = 0;
$scope.esResponse = resp;
$scope.processTableGroups(tabifyAggResponse($scope.vis, resp));
}
});

$scope.$watch('vis.params', function (val) {
if ($scope.esResponse) {
metrics.length = 0;
$scope.processTableGroups(tabifyAggResponse($scope.vis, $scope.esResponse));
$element.trigger('renderComplete');
}
});
});

0 comments on commit a341bee

Please sign in to comment.