-
See also:
* [Getting started](https://github.com/hastic/hastic-grafana-app/wiki/Getting-started)
* [Wiki](https://github.com/hastic/hastic-grafana-app/wiki)
@@ -27,16 +24,11 @@ See also:
* [Installation from source](https://github.com/hastic/hastic-grafana-app/wiki/Installation-from-source)
* [Changelog](https://github.com/hastic/hastic-grafana-app/wiki/Changelog)
-
# Prerequisites
* [hastic-server](https://github.com/hastic/hastic-server)
* [Grafana >= 5.4.0](https://grafana.com/grafana/download)
+## Support and Consulting
-# Credits
-
-Based on
-
-* [grafana-plugin-template-webpack-typescript](https://github.com/CorpGlory/grafana-plugin-template-webpack-typescript)
-* [@types/grafana](https://github.com/CorpGlory/types-grafana)
+Commercial support, consulting, professional services — please send us your inquiry at ping@hastic.io
diff --git a/package.json b/package.json
index c590768..afce232 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "grafana-hastic-app",
- "version": "0.2.8",
+ "version": "0.3.0",
"description": "Hastic app: labeling and rendeting analytics from hastic-server",
"main": "dist/module",
"scripts": {
@@ -41,6 +41,7 @@
"ts-jest": "^22.4.6",
"ts-loader": "^4.2.0",
"typescript": "^2.8.3",
+ "url-parse": "^1.4.4",
"webpack": "4.7.0",
"webpack-cli": "^2.1.2"
},
diff --git a/src/config/config_ctrl.ts b/src/config/config_ctrl.ts
index 85e2c38..6e125a4 100644
--- a/src/config/config_ctrl.ts
+++ b/src/config/config_ctrl.ts
@@ -1,13 +1,36 @@
import template from './template.html';
-
+import { normalizeUrl } from '../utlis';
class ConfigCtrl {
static template = template;
appModel: any;
+ appEditCtrl: any;
+
constructor() {
if(this.appModel.jsonData === undefined) {
this.appModel.jsonData = {};
}
+
+ this.appEditCtrl.setPreUpdateHook(this.preUpdate.bind(this));
+ this.appEditCtrl.setPostUpdateHook(this.postUpdate.bind(this));
+ }
+
+ preUpdate() {
+ this.normalizeUrl();
+ return Promise.resolve();
+ }
+
+ postUpdate() {
+ // TODO: check whether hasticServerUrl is accessible
+ if(!this.appModel.enabled) {
+ return Promise.resolve();
+ }
+
+ return { message: 'Hastic app installed!' };
+ }
+
+ normalizeUrl() {
+ this.appModel.jsonData.hasticServerUrl = normalizeUrl(this.appModel.jsonData.hasticServerUrl);
}
}
diff --git a/src/config/template.html b/src/config/template.html
index 2312aa4..309c183 100644
--- a/src/config/template.html
+++ b/src/config/template.html
@@ -2,6 +2,11 @@
-
+
${s.analyticUnit.name}:
diff --git a/src/panel/graph_panel/models/analytic_unit.ts b/src/panel/graph_panel/models/analytic_unit.ts
index 92ac121..85e70c8 100644
--- a/src/panel/graph_panel/models/analytic_unit.ts
+++ b/src/panel/graph_panel/models/analytic_unit.ts
@@ -2,11 +2,18 @@ import { SegmentsSet } from './segment_set';
import { SegmentArray } from './segment_array';
import { Segment, SegmentId } from './segment';
-import { ANALYTIC_UNIT_COLORS } from '../colors';
+import { ANALYTIC_UNIT_COLORS, DEFAULT_DELETED_SEGMENT_COLOR } from '../colors';
import _ from 'lodash';
+export enum LabelingMode {
+ LABELING = 'LABELING',
+ UNLABELING = 'UNLABELING',
+ DELETING = 'DELETING',
+ NOT_IN_LABELING_MODE = 'NOT_IN_LABELING_MODE'
+};
+
export type AnalyticSegmentPair = { analyticUnit: AnalyticUnit, segment: AnalyticSegment };
export type AnalyticSegmentsSearcher = (point: number, rangeDist: number) => AnalyticSegmentPair[];
@@ -23,8 +30,8 @@ export class AnalyticSegment extends Segment {
export class AnalyticUnit {
+ private _labelingMode: LabelingMode = LabelingMode.LABELING;
private _selected: boolean = false;
- private _deleteMode: boolean = false;
private _saving: boolean = false;
private _segmentSet = new SegmentArray();
private _status: string;
@@ -36,7 +43,8 @@ export class AnalyticUnit {
}
_.defaults(this._panelObject, {
name: 'AnalyticUnitName',
- color: ANALYTIC_UNIT_COLORS[0],
+ labeledColor: ANALYTIC_UNIT_COLORS[0],
+ deletedColor: DEFAULT_DELETED_SEGMENT_COLOR,
detectorType: 'pattern',
type: 'GENERAL',
alert: false
@@ -58,8 +66,11 @@ export class AnalyticUnit {
set confidence(value: number) { this._panelObject.confidence = value; }
get confidence(): number { return this._panelObject.confidence; }
- set color(value: string) { this._panelObject.color = value; }
- get color(): string { return this._panelObject.color; }
+ set labeledColor(value: string) { this._panelObject.labeledColor = value; }
+ get labeledColor(): string { return this._panelObject.labeledColor; }
+
+ set deletedColor(value: string) { this._panelObject.deletedColor = value; }
+ get deletedColor(): string { return this._panelObject.deletedColor; }
set alert(value: boolean) { this._panelObject.alert = value; }
get alert(): boolean { return this._panelObject.alert; }
@@ -67,8 +78,8 @@ export class AnalyticUnit {
get selected(): boolean { return this._selected; }
set selected(value: boolean) { this._selected = value; }
- get deleteMode(): boolean { return this._deleteMode; }
- set deleteMode(value: boolean) { this._deleteMode = value; }
+ get labelingMode(): LabelingMode { return this._labelingMode; }
+ set labelingMode(value: LabelingMode) { this._labelingMode = value; }
get saving(): boolean { return this._saving; }
set saving(value: boolean) { this._saving = value; }
@@ -81,16 +92,13 @@ export class AnalyticUnit {
}
addLabeledSegment(segment: Segment, deleted: boolean): AnalyticSegment {
- var asegment = new AnalyticSegment(true, segment.id, segment.from, segment.to, deleted);
+ const asegment = new AnalyticSegment(!deleted, segment.id, segment.from, segment.to, deleted);
this._segmentSet.addSegment(asegment);
return asegment;
}
removeSegmentsInRange(from: number, to: number): AnalyticSegment[] {
let deletedSegments = this._segmentSet.removeInRange(from, to);
- deletedSegments.forEach(s => {
- s.deleted = true;
- });
return deletedSegments;
}
diff --git a/src/panel/graph_panel/models/segment_array.ts b/src/panel/graph_panel/models/segment_array.ts
index a07ffa4..5038eeb 100644
--- a/src/panel/graph_panel/models/segment_array.ts
+++ b/src/panel/graph_panel/models/segment_array.ts
@@ -47,7 +47,7 @@ export class SegmentArray implements SegmentsSet {
findSegments(point: number, rangeDist: number): T[] {
return this._segments.filter(s => {
- var expanded = s.expandDist(rangeDist, 0.01);
+ const expanded = s.expandDist(rangeDist, 0.01);
return (expanded.from <= point) && (point <= expanded.to);
});
}
diff --git a/src/panel/graph_panel/partials/help_section.html b/src/panel/graph_panel/partials/help_section.html
new file mode 100644
index 0000000..64dc52e
--- /dev/null
+++ b/src/panel/graph_panel/partials/help_section.html
@@ -0,0 +1,24 @@
+
+ For usage instructions: Visit our Wiki page. + + If you encounter any problems: + Look for solution or create a new Issue here. + + Available labeling patterns examples: + 1) General: patterns in your data that don't fall under any of provided built-in patterns. + + 2) Peaks: a sharp increase to a certain single value, followed by a return to the original value. + +diff --git a/src/panel/graph_panel/partials/tab_analytics.html b/src/panel/graph_panel/partials/tab_analytics.html index 8a4e3f7..81637a7 100644 --- a/src/panel/graph_panel/partials/tab_analytics.html +++ b/src/panel/graph_panel/partials/tab_analytics.html @@ -11,7 +11,7 @@+ + 3) Troughs: a sharp decrease to a certain single value, followed by a return to the original value. +
+ + 4) Jumps: increase to a certain value without returning to the original state. +
+ + 5) Drops: decrease to a certain value without returning to the original state. +
+ + 6) Custom: any custom model created and imported by you. +
-