Remove Graphite query prefix from preferences

circonus-labs · May 16, 2019 · 2010c04 · 2010c04
1 parent f341111
commit 2010c04
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -38,17 +38,12 @@ The Account ID associated with the account to pull metrics from. For standalone
 ### API Token
 The API Token associated with the account to pull metrics from. This can be found on your API Tokens page after logging in at [https://www.circonus.com/](https://www.circonus.com/) in the "User Profile" section.
 
-### Query Prefix
-Prefix to be added to all queries sent to IRONdb.
-* For standalone installations, this defaults to "**graphite.**".
-* For hosted installations, this defaults to "**reconnoiter.**".
-
 ## Usage
 
 1. Create a new panel and set the datasource to name selected in the IRONdb datasource configuration.
 
 ### Normal Queries
-For normal queries, use the metric browser to navigate the metric hierarchy of your IRONdb instance or type queries manually using the *Toggle Edit Mode* menu item to the right. The query prefix configured for the selected datasource is prepended to all queries against the IRONdb instance.
+For normal queries, use the metric browser to navigate the metric hierarchy of your IRONdb instance or type queries manually using the *Toggle Edit Mode* menu item to the right.
 ![](img/irondb-graph-metric-browser.png)
 
 ### CAQL Queries

diff --git a/dist/README.md b/dist/README.md
@@ -38,17 +38,12 @@ The Account ID associated with the account to pull metrics from. For standalone
 ### API Token
 The API Token associated with the account to pull metrics from. This can be found on your API Tokens page after logging in at [https://www.circonus.com/](https://www.circonus.com/) in the "User Profile" section.
 
-### Query Prefix
-Prefix to be added to all queries sent to IRONdb.
-* For standalone installations, this defaults to "**graphite.**".
-* For hosted installations, this defaults to "**reconnoiter.**".
-
 ## Usage
 
 1. Create a new panel and set the datasource to name selected in the IRONdb datasource configuration.
 
 ### Normal Queries
-For normal queries, use the metric browser to navigate the metric hierarchy of your IRONdb instance or type queries manually using the *Toggle Edit Mode* menu item to the right. The query prefix configured for the selected datasource is prepended to all queries against the IRONdb instance.
+For normal queries, use the metric browser to navigate the metric hierarchy of your IRONdb instance or type queries manually using the *Toggle Edit Mode* menu item to the right.
 ![](img/irondb-graph-metric-browser.png)
 
 ### CAQL Queries

diff --git a/dist/datasource.d.ts b/dist/datasource.d.ts
@@ -8,7 +8,6 @@ export default class IrondbDatasource {
     type: string;
     accountId: number;
     irondbType: string;
-    queryPrefix: string;
     resultsLimit: string;
     url: any;
     apiToken: string;

diff --git a/dist/datasource.js b/dist/datasource.js
diff --git a/dist/datasource.js.map b/dist/datasource.js.map
diff --git a/dist/datasource.ts b/dist/datasource.ts
@@ -8,7 +8,6 @@ export default class IrondbDatasource {
   type: string;
   accountId: number;
   irondbType: string;
-  queryPrefix: string;
   resultsLimit: string;
   url: any;
   apiToken: string;
@@ -25,7 +24,6 @@ export default class IrondbDatasource {
     this.id = instanceSettings.id;
     this.accountId = (instanceSettings.jsonData || {}).accountId;
     this.irondbType = (instanceSettings.jsonData || {}).irondbType;
-    this.queryPrefix = (instanceSettings.jsonData || {}).queryPrefix;
     this.resultsLimit = (instanceSettings.jsonData || {}).resultsLimit;
     this.apiToken = (instanceSettings.jsonData || {}).apiToken;
     this.url = instanceSettings.url;
@@ -169,7 +167,7 @@ export default class IrondbDatasource {
     headers['X-Snowth-Advisory-Limit'] = this.resultsLimit;
     if ('standalone' == this.irondbType && !isCaql) {
       if (!isFind) {
-        baseUrl = baseUrl + '/' + this.queryPrefix + '/series_multi';
+        baseUrl = baseUrl + '/series_multi';
       }
     }
     if (isCaql && !isFind) {
@@ -403,7 +401,7 @@ export default class IrondbDatasource {
                 result[i]['leaf_data'].egress_function = target.egressoverride;
               }
               if ('hosted' == this.irondbType) {
-                cleanOptions['std']['names'].push({ leaf_name: this.queryPrefix + result[i]['name'], leaf_data: result[i]['leaf_data'] });
+                cleanOptions['std']['names'].push({ leaf_name: result[i]['name'], leaf_data: result[i]['leaf_data'] });
               } else {
                 cleanOptions['std']['names'].push({ leaf_name: result[i]['metric_name'], leaf_data: result[i]['leaf_data'] });
               }

diff --git a/dist/partials/config.html b/dist/partials/config.html
@@ -21,7 +21,6 @@ <h3 class="page-heading">IRONdb Details</h3>
       <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.accountId' placeholder="enter account id"></input>
       <info-popover mode="right-absolute">
           <p>The Account ID associated with the account to pull metrics from. This can be found on your user profile page after logging in at <a href="https://www.circonus.com/">https://www.circonus.com/</a> in the "My Accounts" section.</p>
-          <p>For standalone installations, this is the account_id setting as configured in the "Graphite Listener" section of the /opt/circonus/etc/irondb.conf file.</p>
       </info-popover>
     </div>
     <div class="gf-form" ng-show="ctrl.current.jsonData.irondbType == 'hosted'">
@@ -31,15 +30,6 @@ <h3 class="page-heading">IRONdb Details</h3>
           <p>The API Token associated with the account to pull metrics from. This can be found on your API Tokens page after logging in at <a href="https://www.circonus.com/">https://www.circonus.com/</a> in the "User Profile" section.</p>
       </info-popover>
     </div>
-    <div class="gf-form">
-      <span class="gf-form-label width-9">Query Prefix</span>
-      <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.queryPrefix' ng-init="ctrl.current.jsonData.queryPrefix"></input>
-      <info-popover mode="right-absolute">
-          <p>Prefix to be added to all queries sent to IRONdb.</p>
-          <p>For standalone installations, this defaults to "<strong>graphite.</strong>".</p>
-          <p>For hosted installations, this defaults to "<strong>reconnoiter.</strong>".</p>
-      </info-popover>
-    </div>
     <div class="gf-form">
       <span class="gf-form-label width-9">Results Limit</span>
       <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.resultsLimit' ng-init="ctrl.current.jsonData.resultsLimit"></input>

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -8,7 +8,6 @@ export default class IrondbDatasource {
   type: string;
   accountId: number;
   irondbType: string;
-  queryPrefix: string;
   resultsLimit: string;
   url: any;
   apiToken: string;
@@ -25,7 +24,6 @@ export default class IrondbDatasource {
     this.id = instanceSettings.id;
     this.accountId = (instanceSettings.jsonData || {}).accountId;
     this.irondbType = (instanceSettings.jsonData || {}).irondbType;
-    this.queryPrefix = (instanceSettings.jsonData || {}).queryPrefix;
     this.resultsLimit = (instanceSettings.jsonData || {}).resultsLimit;
     this.apiToken = (instanceSettings.jsonData || {}).apiToken;
     this.url = instanceSettings.url;
@@ -169,7 +167,7 @@ export default class IrondbDatasource {
     headers['X-Snowth-Advisory-Limit'] = this.resultsLimit;
     if ('standalone' == this.irondbType && !isCaql) {
       if (!isFind) {
-        baseUrl = baseUrl + '/' + this.queryPrefix + '/series_multi';
+        baseUrl = baseUrl + '/series_multi';
       }
     }
     if (isCaql && !isFind) {
@@ -403,7 +401,7 @@ export default class IrondbDatasource {
                 result[i]['leaf_data'].egress_function = target.egressoverride;
               }
               if ('hosted' == this.irondbType) {
-                cleanOptions['std']['names'].push({ leaf_name: this.queryPrefix + result[i]['name'], leaf_data: result[i]['leaf_data'] });
+                cleanOptions['std']['names'].push({ leaf_name: result[i]['name'], leaf_data: result[i]['leaf_data'] });
               } else {
                 cleanOptions['std']['names'].push({ leaf_name: result[i]['metric_name'], leaf_data: result[i]['leaf_data'] });
               }

diff --git a/src/partials/config.html b/src/partials/config.html
@@ -21,7 +21,6 @@ <h3 class="page-heading">IRONdb Details</h3>
       <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.accountId' placeholder="enter account id"></input>
       <info-popover mode="right-absolute">
           <p>The Account ID associated with the account to pull metrics from. This can be found on your user profile page after logging in at <a href="https://www.circonus.com/">https://www.circonus.com/</a> in the "My Accounts" section.</p>
-          <p>For standalone installations, this is the account_id setting as configured in the "Graphite Listener" section of the /opt/circonus/etc/irondb.conf file.</p>
       </info-popover>
     </div>
     <div class="gf-form" ng-show="ctrl.current.jsonData.irondbType == 'hosted'">
@@ -31,15 +30,6 @@ <h3 class="page-heading">IRONdb Details</h3>
           <p>The API Token associated with the account to pull metrics from. This can be found on your API Tokens page after logging in at <a href="https://www.circonus.com/">https://www.circonus.com/</a> in the "User Profile" section.</p>
       </info-popover>
     </div>
-    <div class="gf-form">
-      <span class="gf-form-label width-9">Query Prefix</span>
-      <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.queryPrefix' ng-init="ctrl.current.jsonData.queryPrefix"></input>
-      <info-popover mode="right-absolute">
-          <p>Prefix to be added to all queries sent to IRONdb.</p>
-          <p>For standalone installations, this defaults to "<strong>graphite.</strong>".</p>
-          <p>For hosted installations, this defaults to "<strong>reconnoiter.</strong>".</p>
-      </info-popover>
-    </div>
     <div class="gf-form">
       <span class="gf-form-label width-9">Results Limit</span>
       <input class="gf-form-input width-30" type="text" ng-model='ctrl.current.jsonData.resultsLimit' ng-init="ctrl.current.jsonData.resultsLimit"></input>