feat: Enable Batch Scraping Configuration (#173)

promitor · Oct 25, 2024 · cbe1b10 · cbe1b10
1 parent 14c11c9
commit cbe1b10
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/promitor-agent-scraper/README.md b/promitor-agent-scraper/README.md
@@ -113,6 +113,9 @@ their default values.
 | `azureMonitor.logging.enabled`  | Indication whether or not to provide logs on the integration with Azure Monitor and its APIs | `false`            |
 | `azureMonitor.logging.logLevel`  | Minimum level of logging for Azure Monitor interactions | N/A |
 | `azureMonitor.integration.useAzureMonitorSdk`  | Whether to use the Azure Monitor SDK for scraping; alternative is the legacy Azure Management Library | `true`
+| `azureMonitor.integration.metricsBatching.enabled` | Whether to scrape metrics in batch mode | `false`
+| `azureMonitor.integration.metricsBatching.maxBatchSize` | Max number of resources within a batch | `50`
+| `azureMonitor.integration.metricsBatching.azureRegion` | Azure region of resource targets for batching | 
 | `azureMonitor.integration.history.startingFromInHours`  | Defines the amount of hours Promitor will use to define the starting point of the time window used for metric queries. | N/A            |
 | `rbac.create` | If true, create & use RBAC resources | `true` |
 | `rbac.podSecurityPolicyEnabled` | Create pod security policy resources | `false` |

diff --git a/promitor-agent-scraper/templates/configmap.yaml b/promitor-agent-scraper/templates/configmap.yaml
@@ -69,7 +69,7 @@ data:
           verbosity: {{ .Values.telemetry.containerLogs.logLevel | quote }}
   {{- end }}
         defaultVerbosity: {{ .Values.telemetry.defaultLogLevel | quote  }}
-  {{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk }}
+  {{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk .Values.azureMonitor.integration.metricsBatching.enabled }}
       azureMonitor:
   {{- if .Values.azureMonitor.logging.enabled }}
         logging:
@@ -78,13 +78,23 @@ data:
   {{- end }}
           isEnabled: {{ .Values.azureMonitor.logging.enabled | quote }}
   {{- end }}
-  {{- if .Values.azureMonitor.integration.history.startingFromInHours }}
+  {{- if or .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk .Values.azureMonitor.integration.metricsBatching.enabled }}
         integration:
-          useAzureMonitorSdk: {{ .Values.azureMonitor.integration.useAzureMonitorSdk | quote}}
+  {{- if .Values.azureMonitor.integration.metricsBatching.enabled }}
+          metricsBatching:
+            enabled: true
+            maxBatchSize: {{ .Values.azureMonitor.integration.metricsBatching.maxBatchSize }}
+            azureRegion: {{ .Values.azureMonitor.integration.metricsBatching.azureRegion }}
+  {{- end }}
+  {{- if .Values.azureMonitor.integration.useAzureMonitorSdk }}
+          useAzureMonitorSdk: {{ .Values.azureMonitor.integration.useAzureMonitorSdk }}
+  {{- end }}
+  {{- if .Values.azureMonitor.integration.history.startingFromInHours }}
           history:
             startingFromInHours: {{ .Values.azureMonitor.integration.history.startingFromInHours }}
   {{- end }}
   {{- end }}
+  {{- end }}
   metrics-declaration.yaml: |-
     version: v1
     azureMetadata:
@@ -99,4 +109,4 @@ data:
         schedule: {{ .Values.metricDefaults.scraping.schedule | quote }}
     metrics:{{- if .Values.metrics | len | eq 0 }} []{{- else }}
 {{ tpl $metrics . | indent 4 }}
-{{- end }}
+{{- end }}
diff --git a/promitor-agent-scraper/values.yaml b/promitor-agent-scraper/values.yaml
@@ -113,6 +113,8 @@ azureMonitor:
     enabled: false
     logLevel:
   integration:
+    metricsBatching:
+      enabled: false
     history:
       startingFromInHours: