Merge branch 'main' of github.com:SumoLogic-Labs/slogen

OpenSLO · Jan 21, 2022 · eb8f47b · eb8f47b
2 parents d84e607 + 2d0898e
commit eb8f47b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -94,13 +94,13 @@ export PATH=`go env GOPATH`/bin:$PATH
 ###### For Linux
 
 ``` shell
-wget -O - https://github.com/SumoLogic-Labs/slogen/releases/download/v0.7.7/slogen_0.7.7_Linux_x86_64.tar.gz | tar xvz -C /path/to/bin
+wget -O - https://github.com/SumoLogic-Labs/slogen/releases/download/v0.7.8/slogen_0.7.8_Linux_x86_64.tar.gz | tar xvz -C /path/to/bin
 ```
 
 ###### For Mac
 
 ``` shell
-wget -O - https://github.com/SumoLogic-Labs/slogen/releases/download/v0.7.7/slogen_0.7.7_Darwin_x86_64.tar.gz | tar xvz -C /path/to/bin
+wget -O - https://github.com/SumoLogic-Labs/slogen/releases/download/v0.7.8/slogen_0.7.8_Darwin_x86_64.tar.gz | tar xvz -C /path/to/bin
 ```
 
 ### Using the tool

diff --git a/libs/queries.go b/libs/queries.go
@@ -146,8 +146,9 @@ const breakDownPanelQueryTimeslices = `
 | BudgetRemaining*100 as %"Budget Remaining (%)"
 | order by BudgetRemaining asc
 | Availability_Percentage as %"Availability (%)" 
-| fields customer_id, %"Availability (%)", %"Budget Remaining (%)", %"Budget Remaining (Time)"
+| fields {{if ne .GroupByStr ""}} {{.GroupByStr}}, {{end}} %"Availability (%)", %"Budget Remaining (%)", %"Budget Remaining (Time)"
 `
+
 const pd = `
 _view=slogen_tf_cloudcollector_cc_ingest_lag_v2 
 | timeslice 1m 

diff --git a/samples/openslo/ingest-lag-timeslice-budgeting.yaml b/samples/openslo/ingest-lag-timeslice-budgeting.yaml
@@ -29,7 +29,7 @@ spec:
         incremental: true
 createView: true
 fields:
-  customer_id: "customer_id"
+  customerID: "customer_id"
   deployment: 'if(isNull(deployment),"dev",deployment)' # using an expression
   cluster: 'if(isNull(cluster),"-",cluster)'
 labels: