-
+
+
+
+
+
+
+
diff --git a/src/home/home.ts b/src/home/home.ts
index b20cbd2d..d933eede 100644
--- a/src/home/home.ts
+++ b/src/home/home.ts
@@ -29,11 +29,13 @@ export class Home {
nativeWindow: any
response: string;
api: string;
- item_type: string;
+ item_type: {'item': string, 'parent': string} = {'item': '', 'parent': 'none'};
version: RInfo;
configurationItems : Array = [
{'title': 'Variable Catalog', 'selector' : 'varcatalog'},
- {'title': 'Influx Servers', 'selector' : 'influxserver'},
+ {'title': 'Outputs', 'selector': 'output'},
+ {'title': 'Kafka Servers', 'selector' : 'kafkaserver', 'parent': 'output'},
+ {'title': 'Influx Servers', 'selector' : 'influxserver', 'parent': 'output'},
{'title': 'OID Conditions', 'selector' : 'oidcondition'},
{'title': 'SNMP Metrics', 'selector' : 'snmpmetric'},
{'title': 'Measurements', 'selector' : 'measurement'},
@@ -56,7 +58,7 @@ export class Home {
constructor(private winRef: WindowRef,public router: Router, public httpAPI: HttpService, private _blocker: BlockUIService, public homeService: HomeService) {
this.nativeWindow = winRef.nativeWindow;
this.getFooterInfo();
- this.item_type= "runtime";
+ this.item_type.item= "runtime";
}
link(url: string) {
@@ -80,9 +82,9 @@ export class Home {
this.mode = !this.mode
}
- clickMenu(selected : string) : void {
- this.item_type = "";
- this.item_type = selected;
+ clickMenu(selected : string, parent: string = 'none') : void {
+ this.item_type.item = selected;
+ this.item_type.parent = parent
}
showImportModal() {
diff --git a/src/influxserver/influxservercfg.component.ts b/src/influxserver/influxservercfg.component.ts
index 03e16ebc..3f7e27c5 100644
--- a/src/influxserver/influxservercfg.component.ts
+++ b/src/influxserver/influxservercfg.component.ts
@@ -92,7 +92,6 @@ export class InfluxServerCfgComponent {
SSLCert: [this.influxserverForm ? this.influxserverForm.value.SSLCert : ''],
SSLKey: [this.influxserverForm ? this.influxserverForm.value.SSLKey : ''],
InsecureSkipVerify: [this.influxserverForm ? this.influxserverForm.value.InsecureSkipVerify : 'true'],
- BufferSize: [this.influxserverForm ? this.influxserverForm.value.BufferSize : 65535, Validators.compose([Validators.required, ValidationService.uintegerNotZeroValidator])],
Description: [this.influxserverForm ? this.influxserverForm.value.Description : '']
});
}
diff --git a/src/influxserver/influxservercfg.data.ts b/src/influxserver/influxservercfg.data.ts
index 581a0dd3..818680db 100644
--- a/src/influxserver/influxservercfg.data.ts
+++ b/src/influxserver/influxservercfg.data.ts
@@ -1,6 +1,6 @@
export const InfluxServerCfgComponentConfig: any =
{
- 'name' : 'Influx Server',
+ 'name' : 'Outputs > InfluxDB Server',
'table-columns' : [
{ title: 'ID', name: 'ID' },
{ title: 'Host', name: 'Host' },
@@ -11,7 +11,6 @@ export const InfluxServerCfgComponentConfig: any =
{ title: 'Retention', name: 'Retention' },
{ title: 'Precision', name: 'Precision' },
{ title: 'Timeout', name: 'Timeout' },
- { title: 'Buffer Size', name: 'BufferSize' },
{ title: 'User Agent', name: 'UserAgent' }
],
'slug' : 'influxcfg'
diff --git a/src/influxserver/influxservereditor.html b/src/influxserver/influxservereditor.html
index 2f4c4ee2..5d1e9d3c 100644
--- a/src/influxserver/influxservereditor.html
+++ b/src/influxserver/influxservereditor.html
@@ -180,14 +180,6 @@