Browse Source

Import analytic units (#404)

master
rozetko 5 years ago committed by GitHub
parent
commit
53b2c51c71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      src/panel/graph_panel/controllers/analytic_controller.ts
  2. 44
      src/panel/graph_panel/graph_ctrl.ts
  3. 12
      src/panel/graph_panel/models/panel.ts
  4. 21
      src/panel/graph_panel/partials/import_panel.html
  5. 10
      src/panel/graph_panel/services/analytic_service.ts

12
src/panel/graph_panel/controllers/analytic_controller.ts

@ -17,6 +17,7 @@ import { SegmentArray } from '../models/segment_array';
import { HasticServerInfo, HasticServerInfoUnknown } from '../models/hastic_server_info'; import { HasticServerInfo, HasticServerInfoUnknown } from '../models/hastic_server_info';
import { Condition } from '../models/analytic_units/threshold_analytic_unit'; import { Condition } from '../models/analytic_units/threshold_analytic_unit';
import { DetectionStatus, DETECTION_STATUS_TEXT, DetectionSpan } from '../models/detection'; import { DetectionStatus, DETECTION_STATUS_TEXT, DetectionSpan } from '../models/detection';
import { PanelTemplate, TemplateVariables } from '../models/panel';
import { createAnalyticUnit } from '../models/analytic_units/utils'; import { createAnalyticUnit } from '../models/analytic_units/utils';
import helpSectionText from '../partials/help_section.html'; import helpSectionText from '../partials/help_section.html';
@ -115,8 +116,15 @@ export class AnalyticController {
this._creatingNewAnalyticUnit = false; this._creatingNewAnalyticUnit = false;
} }
async exportAnalyticUnits(): Promise<object> { async exportPanel(): Promise<PanelTemplate> {
return this._analyticService.exportAnalyticUnits(this._panelId); return this._analyticService.exportPanel(this._panelId);
}
async importPanel(
panelTemplate: PanelTemplate,
templateVariables: TemplateVariables
): Promise<void> {
return this._analyticService.importPanel(panelTemplate, templateVariables);
} }
async saveNew(metric: MetricExpanded, datasource: DatasourceRequest) { async saveNew(metric: MetricExpanded, datasource: DatasourceRequest) {

44
src/panel/graph_panel/graph_ctrl.ts

@ -12,12 +12,15 @@ import { BOUND_TYPES } from './models/analytic_units/anomaly_analytic_unit';
import { AnalyticService } from './services/analytic_service'; import { AnalyticService } from './services/analytic_service';
import { AnalyticController } from './controllers/analytic_controller'; import { AnalyticController } from './controllers/analytic_controller';
import { HasticPanelInfo } from './models/hastic_panel_info'; import { HasticPanelInfo } from './models/hastic_panel_info';
import { PanelTemplate, TemplateVariables } from './models/panel';
import { axesEditorComponent } from './axes_editor'; import { axesEditorComponent } from './axes_editor';
import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk'; import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
import { appEvents } from 'grafana/app/core/core' import { appEvents } from 'grafana/app/core/core'
import { BackendSrv } from 'grafana/app/core/services/backend_srv'; import { BackendSrv } from 'grafana/app/core/services/backend_srv';
import angular from 'angular';
import _ from 'lodash'; import _ from 'lodash';
@ -65,6 +68,8 @@ class GraphCtrl extends MetricsPanelCtrl {
to?: number to?: number
}; };
public panelTemplate: PanelTemplate = {};
panelDefaults = { panelDefaults = {
// datasource name, null = default datasource // datasource name, null = default datasource
datasource: null, datasource: null,
@ -305,7 +310,8 @@ class GraphCtrl extends MetricsPanelCtrl {
onInitPanelActions(actions: { text: string, click: string }[]): void { onInitPanelActions(actions: { text: string, click: string }[]): void {
actions.push({ text: 'Export CSV', click: 'ctrl.exportCsv()' }); actions.push({ text: 'Export CSV', click: 'ctrl.exportCsv()' });
actions.push({ text: 'Toggle legend', click: 'ctrl.toggleLegend()' }); actions.push({ text: 'Toggle legend', click: 'ctrl.toggleLegend()' });
actions.push({ text: 'Export analytic units', click: 'ctrl.exportAnalyticUnits()' }); actions.push({ text: 'Export analytic units', click: 'ctrl.exportPanel()' });
actions.push({ text: 'Import analytic units', click: 'ctrl.displayImportPanelModal()' });
} }
async onHasticDatasourceChange() { async onHasticDatasourceChange() {
@ -553,14 +559,44 @@ class GraphCtrl extends MetricsPanelCtrl {
}); });
} }
async exportAnalyticUnits(): Promise<void> { async exportPanel(): Promise<void> {
const json = await this.analyticsController.exportAnalyticUnits(); const panelTemplate = await this.analyticsController.exportPanel();
this.publishAppEvent('show-modal', { this.publishAppEvent('show-modal', {
src: 'public/app/partials/edit_json.html', src: 'public/app/partials/edit_json.html',
model: { object: json, enableCopy: true } model: { object: panelTemplate, enableCopy: true }
});
}
async displayImportPanelModal(): Promise<void> {
const modalScope = this.$scope.$new(true);
const prettify = true;
modalScope.panelTemplate = angular.toJson({}, prettify);
modalScope.import = async (
panelTemplate: string,
grafanaUrl: string,
panelId: string,
datasourceUrl: string
) => {
// TODO: use template variables from form
await this.importPanel(JSON.parse(panelTemplate), {
grafanaUrl: this._grafanaUrl,
panelId: this._panelId,
datasourceUrl: this._datasourceRequest.url
});
};
this.publishAppEvent('show-modal', {
src: `${this.partialsPath}/import_panel.html`,
scope: modalScope
}); });
} }
async importPanel(panelTemplate: PanelTemplate, templateVariables: TemplateVariables): Promise<void> {
// TODO: show import errors properly
await this.analyticsController.importPanel(panelTemplate, templateVariables);
}
// getAnnotationsByTag(tag) { // getAnnotationsByTag(tag) {
// var res = []; // var res = [];
// for (var annotation of this.annotations) { // for (var annotation of this.annotations) {

12
src/panel/graph_panel/models/panel.ts

@ -0,0 +1,12 @@
export type PanelTemplate = {
analyticUnits?: any[],
caches?: any[],
detectionSpans?: any[],
segments?: any[]
}
export type TemplateVariables = {
grafanaUrl: string,
panelId: string,
datasourceUrl: string
};

21
src/panel/graph_panel/partials/import_panel.html

@ -0,0 +1,21 @@
<div id="import-analytic-units">
<div class="tabbed-view-header">
<h2 class="tabbed-view-title">
JSON
</h2>
<button class="tabbed-view-close-btn" ng-click="dismiss()">
<i class="fa fa-remove"></i>
</button>
</div>
<div class="tabbed-view-body">
<div class="gf-form">
<code-editor content="panelTemplate" data-mode="json" data-max-lines="20"></code-editor>
</div>
<div class="gf-form-button-row">
<button type="button" class="btn btn-primary" ng-click="import(panelTemplate); dismiss();">Import</button>
</div>
</div>
</div>

10
src/panel/graph_panel/services/analytic_service.ts

@ -5,6 +5,7 @@ import { SegmentsSet } from '../models/segment_set';
import { AnalyticUnitId, AnalyticUnit, AnalyticSegment } from '../models/analytic_units/analytic_unit'; import { AnalyticUnitId, AnalyticUnit, AnalyticSegment } from '../models/analytic_units/analytic_unit';
import { HasticServerInfo, HasticServerInfoUnknown } from '../models/hastic_server_info'; import { HasticServerInfo, HasticServerInfoUnknown } from '../models/hastic_server_info';
import { DetectionSpan } from '../models/detection'; import { DetectionSpan } from '../models/detection';
import { PanelTemplate, TemplateVariables } from '../models/panel';
import { isHasticServerResponse, isSupportedServerVersion, SUPPORTED_SERVER_VERSION } from '../../../utils'; import { isHasticServerResponse, isSupportedServerVersion, SUPPORTED_SERVER_VERSION } from '../../../utils';
@ -61,7 +62,7 @@ export class AnalyticService {
return resp.analyticUnits; return resp.analyticUnits;
} }
async exportAnalyticUnits(panelId: string): Promise<object> { async exportPanel(panelId: string): Promise<PanelTemplate> {
const resp = await this.get('/panels/template', { panelId }); const resp = await this.get('/panels/template', { panelId });
if(resp === undefined) { if(resp === undefined) {
return {}; return {};
@ -69,6 +70,13 @@ export class AnalyticService {
return resp; return resp;
} }
async importPanel(
panelTemplate: PanelTemplate,
templateVariables: TemplateVariables
): Promise<void> {
await this.post('/panels/template', { panelTemplate, templateVariables });
}
async postNewAnalyticUnit( async postNewAnalyticUnit(
analyticUnit: AnalyticUnit, analyticUnit: AnalyticUnit,
metric: MetricExpanded, metric: MetricExpanded,

Loading…
Cancel
Save