Fix dealing with no segmentations

draios · Apr 11, 2019 · 5118823 · 5118823
1 parent 86fdaf3
commit 5118823
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/datasource.js b/src/datasource.js
@@ -102,7 +102,7 @@ export class SysdigDatasource {
                     isSingleDataPoint: isTabularFormat || targets[0].isSingleDataPoint
                 };
 
-                if (Array.isArray(targetOptions.segmentBy) === false) {
+                if (targetOptions.segmentBy && Array.isArray(targetOptions.segmentBy) === false) {
                     // backwards compatibility: up to v0.3 one segmentation was supported only
                     targetOptions.segmentBy = [targetOptions.segmentBy];
                 }
@@ -113,13 +113,15 @@ export class SysdigDatasource {
                         target.target,
                         options.scopedVars
                     ),
-                    segmentBy: targetOptions.segmentBy.map((segmentBy) =>
-                        TemplatingService.replaceSingleMatch(
-                            this.templateSrv,
-                            segmentBy,
-                            options.scopedVars
-                        )
-                    ),
+                    segmentBy: targetOptions.segmentBy
+                        ? targetOptions.segmentBy.map((segmentBy) =>
+                              TemplatingService.replaceSingleMatch(
+                                  this.templateSrv,
+                                  segmentBy,
+                                  options.scopedVars
+                              )
+                          )
+                        : null,
                     filter: TemplatingService.replace(
                         this.templateSrv,
                         targetOptions.filter,

diff --git a/src/sysdig_dashboard_helper.js b/src/sysdig_dashboard_helper.js
@@ -292,7 +292,7 @@ class TimeSeriesBuilder extends BaseBuilder {
                 target: value.metricId,
                 timeAggregation: value.timeAggregation,
                 groupAggregation: value.groupAggregation,
-                segmentBy: keys.length === 1 ? keys[0].metricId : null,
+                segmentBy: keys.length > 0 ? keys.map((key) => key.metricId) : null,
                 filter: this.getTargetFilter(sysdigDashboard, sysdigPanel),
                 sortDirection: this.getTargetSortDirection(sysdigPanel),
                 pageLimit: this.getTargetPageLimit(sysdigPanel)
@@ -566,7 +566,7 @@ class TableBuilder extends TimeSeriesBuilder {
                     target: value.metricId,
                     timeAggregation: value.timeAggregation || 'concat',
                     groupAggregation: value.groupAggregation || 'concat',
-                    segmentBy: keys.map((key) => key.metricId),
+                    segmentBy: keys.length > 0 ? keys.map((key) => key.metricId) : null,
                     filter: this.getTargetFilter(sysdigDashboard, sysdigPanel),
                     sortDirection: this.getTargetSortDirection(sysdigPanel),
                     pageLimit: this.getTargetPageLimit(sysdigPanel)