Skip to content

Commit cbe1b10

Browse files
authored
feat: Enable Batch Scraping Configuration (#173)
1 parent 14c11c9 commit cbe1b10

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

promitor-agent-scraper/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ their default values.
113113
| `azureMonitor.logging.enabled` | Indication whether or not to provide logs on the integration with Azure Monitor and its APIs | `false` |
114114
| `azureMonitor.logging.logLevel` | Minimum level of logging for Azure Monitor interactions | N/A |
115115
| `azureMonitor.integration.useAzureMonitorSdk` | Whether to use the Azure Monitor SDK for scraping; alternative is the legacy Azure Management Library | `true`
116+
| `azureMonitor.integration.metricsBatching.enabled` | Whether to scrape metrics in batch mode | `false`
117+
| `azureMonitor.integration.metricsBatching.maxBatchSize` | Max number of resources within a batch | `50`
118+
| `azureMonitor.integration.metricsBatching.azureRegion` | Azure region of resource targets for batching |
116119
| `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 |
117120
| `rbac.create` | If true, create & use RBAC resources | `true` |
118121
| `rbac.podSecurityPolicyEnabled` | Create pod security policy resources | `false` |

promitor-agent-scraper/templates/configmap.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data:
6969
verbosity: {{ .Values.telemetry.containerLogs.logLevel | quote }}
7070
{{- end }}
7171
defaultVerbosity: {{ .Values.telemetry.defaultLogLevel | quote }}
72-
{{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk }}
72+
{{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk .Values.azureMonitor.integration.metricsBatching.enabled }}
7373
azureMonitor:
7474
{{- if .Values.azureMonitor.logging.enabled }}
7575
logging:
@@ -78,13 +78,23 @@ data:
7878
{{- end }}
7979
isEnabled: {{ .Values.azureMonitor.logging.enabled | quote }}
8080
{{- end }}
81-
{{- if .Values.azureMonitor.integration.history.startingFromInHours }}
81+
{{- if or .Values.azureMonitor.integration.history.startingFromInHours .Values.azureMonitor.integration.useAzureMonitorSdk .Values.azureMonitor.integration.metricsBatching.enabled }}
8282
integration:
83-
useAzureMonitorSdk: {{ .Values.azureMonitor.integration.useAzureMonitorSdk | quote}}
83+
{{- if .Values.azureMonitor.integration.metricsBatching.enabled }}
84+
metricsBatching:
85+
enabled: true
86+
maxBatchSize: {{ .Values.azureMonitor.integration.metricsBatching.maxBatchSize }}
87+
azureRegion: {{ .Values.azureMonitor.integration.metricsBatching.azureRegion }}
88+
{{- end }}
89+
{{- if .Values.azureMonitor.integration.useAzureMonitorSdk }}
90+
useAzureMonitorSdk: {{ .Values.azureMonitor.integration.useAzureMonitorSdk }}
91+
{{- end }}
92+
{{- if .Values.azureMonitor.integration.history.startingFromInHours }}
8493
history:
8594
startingFromInHours: {{ .Values.azureMonitor.integration.history.startingFromInHours }}
8695
{{- end }}
8796
{{- end }}
97+
{{- end }}
8898
metrics-declaration.yaml: |-
8999
version: v1
90100
azureMetadata:
@@ -99,4 +109,4 @@ data:
99109
schedule: {{ .Values.metricDefaults.scraping.schedule | quote }}
100110
metrics:{{- if .Values.metrics | len | eq 0 }} []{{- else }}
101111
{{ tpl $metrics . | indent 4 }}
102-
{{- end }}
112+
{{- end }}

promitor-agent-scraper/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ azureMonitor:
113113
enabled: false
114114
logLevel:
115115
integration:
116+
metricsBatching:
117+
enabled: false
116118
history:
117119
startingFromInHours:
118120

0 commit comments

Comments
 (0)