From 14e81fc6791104f6a8aaf52622c3f7918238f7d9 Mon Sep 17 00:00:00 2001 From: Vipin Kumar Date: Mon, 13 Oct 2025 17:03:17 +0530 Subject: [PATCH 1/2] feat: prometheus config support in DA --- ibm_catalog.json | 8 ++++++++ solutions/fully-configurable/main.tf | 1 + solutions/fully-configurable/variables.tf | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/ibm_catalog.json b/ibm_catalog.json index 86290d8..5f7133d 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -407,6 +407,14 @@ { "key": "agent_limits_memory" }, + { + "key": "prometheus_config", + "custom_config": { + "type": "code_editor", + "grouping": "deployment", + "original_grouping": "deployment" + } + }, { "key": "max_surge", "value_constraints": [ diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index ad54868..350766d 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -72,6 +72,7 @@ module "monitoring_agent" { cluster_shield_limits_cpu = var.cluster_shield_limits_cpu cluster_shield_requests_memory = var.cluster_shield_requests_memory cluster_shield_limits_memory = var.cluster_shield_limits_memory + prometheus_config = var.prometheus_config max_unavailable = var.max_unavailable max_surge = var.max_surge priority_class_name = var.priority_class_name diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 772a078..de113a1 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -388,6 +388,13 @@ variable "cluster_shield_limits_memory" { default = "1536Mi" } +variable "prometheus_config" { + description = "Prometheus configuration for the agent. If you want to enable Prometheus configuration provide the prometheus.yaml file content in `hcl` format. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-monitoring-agent/blob/main/solutions/fully-configurable/DA-types.md#prometheus_config)." + type = map(any) + default = {} + nullable = false +} + variable "provider_visibility" { description = "Set the visibility value for the IBM terraform provider. Supported values are `public`, `private`, `public-and-private`. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/guides/custom-service-endpoints)." type = string From 28bffa94845d247314722065dd5893c37704da4b Mon Sep 17 00:00:00 2001 From: Vipin Kumar Date: Mon, 13 Oct 2025 18:39:49 +0530 Subject: [PATCH 2/2] updated da type description --- solutions/fully-configurable/DA-types.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/fully-configurable/DA-types.md b/solutions/fully-configurable/DA-types.md index b054751..feb63f7 100644 --- a/solutions/fully-configurable/DA-types.md +++ b/solutions/fully-configurable/DA-types.md @@ -50,7 +50,7 @@ Use `metrics_filter` to optimize your monitoring setup by collecting only the me ## `prometheus_config` -The `prometheus_config` variable allows you to enable sysdig agent to scrape metrics from processes that expose Prometheus metric endpoints on its own host and send findings to the Sysdig collector for storing and further processing. +The `prometheus_config` variable allows you to enable monitoring agent to scrape metrics from processes that expose Prometheus metric endpoints on its own host and send findings to the Sysdig collector for storing and further processing. ### Type