Skip to content

Commit

Permalink
* change the "Disable State" phrase to "Disable Criteria"
Browse files Browse the repository at this point in the history
  • Loading branch information
YehonatanVonage committed Mar 14, 2017
1 parent 88b5ff2 commit 24289f8
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ You can also repeat the panel on a template if you have multiple instances that
1. For severity disply, select the `Threshold` option type under `Status Type`. Enter the `Warning` and `Critical` thresholds for each of your queries.
* If you want the result to always be displayed with it's value (regardless to the thresholds), check the box titled `Show Value`
* The plugin automatically detects if higher values are good, or lower values are good by checking which threshold is higher/lower. i.e. if in your metric higher values are better, put a lower value in the "critical" threshold than the "warning" threshold.
2. For disable display, select the "Disable State" option type under "Status Type". Enter the `Disable Value` for each of your queries.
2. For disable display, select the `Disable Criteria` option type under "Status Type". Enter the `Disable Value` for each of your queries.
3. For annotation, select the "Annotation" option type under "Status Type". The alias + the value of the metric will be shown on the top left.
4. If the query returns multiple values, choose the type of aggregation you want to be used (`None` will just use the most first result)

Expand Down
2 changes: 1 addition & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ You can also repeat the panel on a template if you have multiple instances that
1. For severity disply, select the `Threshold` option type under `Status Type`. Enter the `Warning` and `Critical` thresholds for each of your queries.
* If you want the result to always be displayed with it's value (regardless to the thresholds), check the box titled `Show Value`
* The plugin automatically detects if higher values are good, or lower values are good by checking which threshold is higher/lower. i.e. if in your metric higher values are better, put a lower value in the "critical" threshold than the "warning" threshold.
2. For disable display, select the "Disable State" option type under "Status Type". Enter the `Disable Value` for each of your queries.
2. For disable display, select the `Disable Criteria` option type under "Status Type". Enter the `Disable Value` for each of your queries.
3. For annotation, select the "Annotation" option type under "Status Type". The alias + the value of the metric will be shown on the top left.
4. If the query returns multiple values, choose the type of aggregation you want to be used (`None` will just use the most first result)

Expand Down
8 changes: 4 additions & 4 deletions dist/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h5 class="section-heading">Metric display type</h5>
The type of data to show to the panel<br/>
<strong>Note:</strong> 'Threshold' will select the first value. <br/> <br/>
<strong>Threshold</strong> - Change background color of the panel if got warning / error + show the alias of the problematic metrics. <br/>
<strong>Disabled state</strong> - Change background color of the panel if disabled. <br/>
<strong>Disable Criteria</strong> - Change background color of the panel if disabled. <br/>
<strong>Annotation</strong> - Show extra info on the panel on top right.
</info-popover>
</span>
Expand Down Expand Up @@ -137,10 +137,10 @@ <h5 class="section-heading">Threshold</h5>
</div>

<!--Disable Section-->
<div ng-if="measurement.displayType == 'Disable State'">
<h5 class="section-heading">Disable State</h5>
<div ng-if="measurement.displayType == 'Disable Criteria'">
<h5 class="section-heading">Disable Criteria</h5>

<!--Disable state-->
<!--Disable Criteria-->
<div class="gf-form">
<span class="gf-form-label width-12">
Disable Value
Expand Down
4 changes: 2 additions & 2 deletions dist/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
{"name": "Warning State", "path": "img/warning.png"},
{"name": "Critical State", "path": "img/error.png"}
],
"version": "1.0.1",
"updated": "2017-2-6"
"version": "1.0.2",
"updated": "2017-3-14"
},

"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions dist/status_ctrl.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/status_ctrl.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h5 class="section-heading">Metric display type</h5>
The type of data to show to the panel<br/>
<strong>Note:</strong> 'Threshold' will select the first value. <br/> <br/>
<strong>Threshold</strong> - Change background color of the panel if got warning / error + show the alias of the problematic metrics. <br/>
<strong>Disabled state</strong> - Change background color of the panel if disabled. <br/>
<strong>Disable Criteria</strong> - Change background color of the panel if disabled. <br/>
<strong>Annotation</strong> - Show extra info on the panel on top right.
</info-popover>
</span>
Expand Down Expand Up @@ -137,10 +137,10 @@ <h5 class="section-heading">Threshold</h5>
</div>

<!--Disable Section-->
<div ng-if="measurement.displayType == 'Disable State'">
<h5 class="section-heading">Disable State</h5>
<div ng-if="measurement.displayType == 'Disable Criteria'">
<h5 class="section-heading">Disable Criteria</h5>

<!--Disable state-->
<!--Disable Criteria-->
<div class="gf-form">
<span class="gf-form-label width-12">
Disable Value
Expand Down
4 changes: 2 additions & 2 deletions src/status_ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class StatusPluginCtrl extends MetricsPanelCtrl {
//this.log = $log.debug;
this.filter = $filter;

this.displayTypes = ['Threshold', 'Disable State', 'Annotation'];
this.displayTypes = ['Threshold', 'Disable Criteria', 'Annotation'];
this.aggregations = ['Last', 'First', 'Max', 'Min', 'Sum', 'Avg'];

/** Bind events to functions **/
Expand Down Expand Up @@ -119,7 +119,7 @@ export class StatusPluginCtrl extends MetricsPanelCtrl {
if (target.displayType == "Threshold") {
this.handleThresholdStatus(s, target);
}
else if (target.displayType == "Disable State") {
else if (target.displayType == "Disable Criteria") {
this.handleDisabledStatus(s,target);
}
else if (target.displayType == "Annotation") {
Expand Down

0 comments on commit 24289f8

Please sign in to comment.