Skip to content

Commit

Permalink
Update for version 20200831-grafana6
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Ferrero committed Aug 31, 2020
1 parent 93b82f4 commit 9a0eb11
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Smallest official image (~1k)
FROM hello-world

ADD . /skyminer-plugin
ADD . /kairosdb-enhanced-plugin
4 changes: 2 additions & 2 deletions src/partials/annotations.editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/tags.editor.html'"></ng-include>
<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/metric.time.override.html'"
ng-if="ctrl.datasource.type === 'grafana-skyminer-datasource'"></ng-include>
<skyminer-feature ng-if="ctrl.showFeatures()"
<kairosdb-enhanced-feature ng-if="ctrl.showFeatures()"
ng-repeat="feature in ctrl.features track by $index"
template="feature"
feature="ctrl.target.query.features[$index]"
variables="ctrl.templateVariables"
></skyminer-feature>
></kairosdb-enhanced-feature>
</div>
2 changes: 1 addition & 1 deletion src/partials/feature.component.editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
</bootstrap-tagsinput>
</div>

<skyminer-feature-component-editor class="gf-form-inline" component="parameter" ng-switch-when="object"></skyminer-feature-component-editor>
<kairosdb-enhanced-feature-component-editor class="gf-form-inline" component="parameter" ng-switch-when="object"></kairosdb-enhanced-feature-component-editor>
</div>
6 changes: 3 additions & 3 deletions src/partials/feature.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<gf-form-switch class="gf-form" label="Show optional parameters" checked="ctrl.showOptional"></gf-form-switch>
</div>
<div class="separator"></div>
<skyminer-feature-component-editor class="gf-form-inline" component="pickedComponent"></skyminer-feature-component-editor>
<kairosdb-enhanced-feature-component-editor class="gf-form-inline" component="pickedComponent"></kairosdb-enhanced-feature-component-editor>
<div class="separator"></div>
<div class="gf-form" ng-if="pickedComponent">
<label class="gf-form-label">
Expand All @@ -41,11 +41,11 @@
</div>
</div>
<!-- List of all component -->
<skyminer-feature-component class="gf-form-inline"
<kairosdb-enhanced-feature-component class="gf-form-inline"
ng-repeat="component in ctrl.feature.components track by $index"
component="component"
on-remove="ctrl.remove(component)"
on-edit="ctrl.edit(component)"
on-move-up="ctrl.moveUp(component)"
on-move-down="ctrl.moveDown(component)"></skyminer-feature-component>
on-move-down="ctrl.moveDown(component)"></kairosdb-enhanced-feature-component>
</div>
2 changes: 1 addition & 1 deletion src/partials/metric.name.row.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
</div>

<skyminer-metric-name-field value="ctrl.target.query.metricName" alias="ctrl.target.query.alias" metric-names="ctrl.datasource.metricNamesStore.metricNames"></skyminer-metric-name-field>
<kairosdb-enhanced-metric-name-field value="ctrl.target.query.metricName" alias="ctrl.target.query.alias" metric-names="ctrl.datasource.metricNamesStore.metricNames"></kairosdb-enhanced-metric-name-field>

<div class="gf-form">
<label class="gf-form-label" bs-tooltip="'Refresh metric names'" ng-click="ctrl.loadMetricNames()">
Expand Down
4 changes: 2 additions & 2 deletions src/partials/query.editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/tags.editor.html'"></ng-include>
<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/metric.time.override.html'"
ng-if="ctrl.datasource.type === 'grafana-skyminer-datasource'"></ng-include>
<skyminer-feature ng-if="ctrl.showFeatures()"
<kairosdb-enhanced-feature ng-if="ctrl.showFeatures()"
ng-repeat="feature in ctrl.features track by $index"
template="feature"
feature="ctrl.target.query.features[$index]"
variables="ctrl.templateVariables"
></skyminer-feature>
></kairosdb-enhanced-feature>
</query-editor-row>
4 changes: 2 additions & 2 deletions src/partials/tags.editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
</div>
</div>
<!-- tags from controls -->
<skyminer-tags-select
<kairosdb-enhanced-tags-select
ng-if="!ctrl.isMetricNameTemplateVariable"
selected-values="ctrl.target.query.tags[tagName]"
tag-name="tagName"
tag-values="tagValues"
ng-repeat="(tagName, tagValues) in ctrl.tags.tags">
</skyminer-tags-select>
</kairosdb-enhanced-tags-select>
<!-- added filters -->
<ng-include src="'public/plugins/grafana-kairosdb-enhanced-datasource/partials/filters.editor.html'"></ng-include>
</div>
2 changes: 1 addition & 1 deletion src/partials/tags.select.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<div class="tags-container">
<div class="gf-form" ng-repeat="segment in ctrl.segments">
<skyminer-tag-input segment="segment" tag-values="ctrl.availableValues" on-change="ctrl.onChange()"></skyminer-tag-input>
<kairosdb-enhanced-tag-input segment="segment" tag-values="ctrl.availableValues" on-change="ctrl.onChange()"></kairosdb-enhanced-tag-input>
<div class="gf-form-label" ng-if="!$last">
<a ng-click="ctrl.remove(segment)">
<i class="fa fa-times"></i>
Expand Down

0 comments on commit 9a0eb11

Please sign in to comment.