From d51fa94173f32b9b36e1209a8a6f035b0a36b3be Mon Sep 17 00:00:00 2001 From: v-zhuravlev Date: Fri, 1 Nov 2024 16:48:13 +0800 Subject: [PATCH] Add support for empty lists: instanceLabels=[],grouplabels=[] in commonlib.variables generation --- .../common/variables/variables.libsonnet | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/common-lib/common/variables/variables.libsonnet b/common-lib/common/variables/variables.libsonnet index 9a1f65c73..1a8d255d7 100644 --- a/common-lib/common/variables/variables.libsonnet +++ b/common-lib/common/variables/variables.libsonnet @@ -59,14 +59,21 @@ local utils = import '../utils.libsonnet'; [root.datasources.prometheus] + variablesFromLabels(groupLabels, instanceLabels, filteringSelector, multiInstance=false), queriesSelectorAdvancedSyntax: - '%s' % [ - utils.labelsToPromQLSelectorAdvanced(groupLabels + instanceLabels), - ], + std.join( + ',', + std.filter(function(x) std.length(x) > 0, [ + filteringSelector, + utils.labelsToPromQLSelectorAdvanced(groupLabels + instanceLabels), + ]) + ), queriesSelector: - '%s,%s' % [ - filteringSelector, - utils.labelsToPromQLSelector(groupLabels + instanceLabels), - ], + std.join( + ',', + std.filter(function(x) std.length(x) > 0, [ + filteringSelector, + utils.labelsToPromQLSelector(groupLabels + instanceLabels), + ]) + ), } + if enableLokiLogs then self.withLokiLogs() else {},