Merge branch 'sub-compartments' into 'master'

Sub compartments

See merge request cloudnative/oci-grafana-plugin!16

Author: Faiq Raza

Gopkg.lock

@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"regexp"
+	"strings"
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
@@ -76,7 +78,7 @@ func (o *OCIDatasource) Query(ctx context.Context, tsdbReq *datasource.Datasourc
 	var ts GrafanaCommonRequest
 	json.Unmarshal([]byte(tsdbReq.Queries[0].ModelJson), &ts)
 
-	queryType := tsdbReq.Queries[0].RefId
+	queryType := ts.QueryType
 	if o.config == nil {
 		configProvider, err := getConfigProvider(ts.Environment)
 		if err != nil {
@@ -352,14 +354,18 @@ func (o *OCIDatasource) getCompartments(ctx context.Context, rootCompartment str
 	for {
 		res, err := o.identityClient.ListCompartments(ctx,
 			identity.ListCompartmentsRequest{
-				CompartmentId: &rootCompartment,
-				Page:          page,
+				CompartmentId:          &rootCompartment,
+				Page:                   page,
+				AccessLevel:            identity.ListCompartmentsAccessLevelAny,
+				CompartmentIdInSubtree: common.Bool(true),
 			})
 		if err != nil {
 			return nil, errors.Wrap(err, fmt.Sprintf("this is what we were trying to get %s", rootCompartment))
 		}
 		for _, compartment := range res.Items {
-			m[*(compartment.Name)] = *(compartment.Id)
+			if compartment.LifecycleState == identity.CompartmentLifecycleStateActive {
+				m[*(compartment.Name)] = *(compartment.Id)
+			}
 		}
 		if res.OpcNextPage == nil {
 			break
@@ -428,11 +434,25 @@ func (o *OCIDatasource) queryResponse(ctx context.Context, tsdbReq *datasource.D
 			t := &datasource.TimeSeries{
 				Name: *(item.Name),
 			}
+			var re = regexp.MustCompile(`(?m)\w+Name`)
 			for k, v := range item.Dimensions {
-				if k == "resourceId" {
+				o.logger.Debug(k)
+				if re.MatchString(k) {
 					t.Name = fmt.Sprintf("%s, {%s}", t.Name, v)
 				}
 			}
+			// if there isn't a human readable name fallback to resourceId
+			if t.Name == *(item).Name {
+				resourceID := item.Dimensions["resourceId"]
+				id := resourceID[strings.LastIndex(resourceID, "."):]
+				display := resourceID[0:strings.LastIndex(resourceID, ".")] + id[0:4] + "..." + id[len(id)-6:]
+				t.Name = fmt.Sprintf("%s, {%s}", t.Name, display)
+			}
+			// if the namespace is loadbalancer toss on the Ad name to match the console
+			if *(item.Namespace) == "oci_lbaas" {
+				availabilityDomain := item.Dimensions["availabilityDomain"]
+				t.Name = fmt.Sprintf("%s, %s", t.Name, availabilityDomain)
+			}
 			p := make([]*datasource.Point, 0, len(item.AggregatedDatapoints))
 			for _, metric := range item.AggregatedDatapoints {
 				point := &datasource.Point{

datasource.go

@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { namespaces } from './constants'
+import { aggregations, namespaces } from './constants'
 import retryOrThrow from './util/retry'
 
 export default class OCIDatasource {
@@ -90,8 +90,7 @@ export default class OCIDatasource {
   testDatasource () {
     return this.doRequest({
       targets: [{
-        queryType: 'query',
-        refId: 'test',
+        queryType: 'test',
         region: this.defaultRegion,
         tenancyOCID: this.tenancyOCID,
         compartment: '',
@@ -162,7 +161,6 @@ export default class OCIDatasource {
       tenancyOCID: this.tenancyOCID,
       region: this.templateSrv.replace(region),
       datasourceId: this.id,
-      refId: 'search',
       namespace: this.templateSrv.replace(target.namespace)
     }]
     var options = {
@@ -198,8 +196,7 @@ export default class OCIDatasource {
       region: this.defaultRegion,
       tenancyOCID: this.tenancyOCID,
       queryType: 'compartments',
-      datasourceId: this.id,
-      refId: 'compartments'
+      datasourceId: this.id
     }]
     var options = {
       range: range,
@@ -232,7 +229,6 @@ export default class OCIDatasource {
       tenancyOCID: this.tenancyOCID,
 
       datasourceId: this.id,
-      refId: 'dimensions',
       metric: this.templateSrv.replace(target.metric),
       namespace: this.templateSrv.replace(target.namespace)
     }]
@@ -257,8 +253,7 @@ export default class OCIDatasource {
       region: this.templateSrv.replace(region),
       tenancyOCID: this.tenancyOCID,
 
-      datasourceId: this.id,
-      refId: 'namespaces'
+      datasourceId: this.id
     }],
     range: this.timeSrv.timeRange()
     }).then((namespaces) => { return this.mapToTextValue(namespaces, 'namespaces') })
@@ -268,13 +263,16 @@ export default class OCIDatasource {
     return this.doRequest({ targets: [{
       environment: this.environment,
       queryType: 'regions',
-      datasourceId: this.id,
-      refId: 'regions'
+      datasourceId: this.id
     }],
     range: this.timeSrv.timeRange()
     }).then((regions) => { return this.mapToTextValue(regions, 'regions') })
   }
 
+  getAggregations () {
+    return this.q.when(aggregations)
+  }
+
   doRequest (options) {
     let _this = this
     return retryOrThrow(() => {

src/datasource.js

@@ -15,9 +15,8 @@
           </div>
           <label class="gf-form-label query-keyword width-10">Compartment</label>
           <div class="gf-form-select-wrapper width-10">
-            <gf-form-dropdown model="ctrl.target.compartment"
-              allow-custom="true"
-              lookup-text="true"
+            <gf-form-dropdown
+              model="ctrl.target.compartment"
               get-options="ctrl.getCompartments()"
               on-change="ctrl.onChangeInternal()">
             </gf-form-dropdown>
@@ -31,7 +30,7 @@
             </gf-form-dropdown>
           </div>
           <div class="gf-form">
-            <label class="gf-form-label width-10">Resolution</label>
+            <label class="gf-form-label width-10 query-keyword">Resolution</label>
             <input type="text" class="input-small gf-form-input width-5" ng-model="ctrl.target.resolution" ng-change="ctrl.onChangeInternal()" placeholder="1m"/>
           </div>
         </div>
@@ -51,14 +50,14 @@
           </div>
         </div>
         <div class="gf-form">
-          <label class="gf-form-label width-10">Aggregation</label>
+          <label class="gf-form-label width-10 query-keyword">Aggregation</label>
           <div class="gf-form-select-wrapper width-10">
-            <select
-              class="gf-form-input"
-              ng-model="ctrl.target.aggregation"
-              ng-options="o as o for o in ctrl.getAggregations()"
-              ng-change="ctrl.onChangeInternal()">
-            </select>
+            <gf-form-dropdown
+              model="ctrl.target.aggregation"
+              get-options="ctrl.getAggregations()"
+              on-change="ctrl.onChangeInternal()"
+              allow-custom="true" >
+            </gf-form-dropdown>
           </div>
         </div>
         <div class="gf-form">

src/partials/query.editor.html

@@ -1,6 +1,6 @@
 import { QueryCtrl } from 'app/plugins/sdk'
 import './css/query-editor.css!'
-import { aggregations, windows } from './constants'
+import { windows } from './constants'
 import _ from 'lodash'
 
 export class OCIDatasourceQueryCtrl extends QueryCtrl {
@@ -76,7 +76,11 @@ export class OCIDatasourceQueryCtrl extends QueryCtrl {
   }
 
   getAggregations () {
-    return aggregations
+    return this.datasource.getAggregations().then((aggs) => {
+      return aggs.map((val) => {
+        return { text: val, value: val }
+      })
+    })
   }
 
   onChangeInternal () {