feat: initial module + DA

README.md

@@ -108,9 +108,11 @@ No modules.
 | <a name="input_cloud_monitoring_access_key"></a> [cloud\_monitoring\_access\_key](#input\_cloud\_monitoring\_access\_key) | Access key used by the IBM Cloud Monitoring agent to communicate with the instance | `string` | n/a | yes |
 | <a name="input_cloud_monitoring_agent_name"></a> [cloud\_monitoring\_agent\_name](#input\_cloud\_monitoring\_agent\_name) | Cloud Monitoring agent name. Used for naming all kubernetes and helm resources on the cluster. | `string` | `"sysdig-agent"` | no |
 | <a name="input_cloud_monitoring_agent_namespace"></a> [cloud\_monitoring\_agent\_namespace](#input\_cloud\_monitoring\_agent\_namespace) | Namespace where to deploy the Cloud Monitoring agent. Default value is 'ibm-observe' | `string` | `"ibm-observe"` | no |
+| <a name="input_cloud_monitoring_agent_registry"></a> [cloud\_monitoring\_agent\_registry](#input\_cloud\_monitoring\_agent\_registry) | The image registry to use for the Cloud Monitoring agent. | `string` | `"icr.io/ext/sysdig/agent"` | no |
 | <a name="input_cloud_monitoring_agent_tolerations"></a> [cloud\_monitoring\_agent\_tolerations](#input\_cloud\_monitoring\_agent\_tolerations) | List of tolerations to apply to Cloud Monitoring agent. | <pre>list(object({<br/>    key               = optional(string)<br/>    operator          = optional(string)<br/>    value             = optional(string)<br/>    effect            = optional(string)<br/>    tolerationSeconds = optional(number)<br/>  }))</pre> | <pre>[<br/>  {<br/>    "operator": "Exists"<br/>  },<br/>  {<br/>    "effect": "NoSchedule",<br/>    "key": "node-role.kubernetes.io/master",<br/>    "operator": "Exists"<br/>  }<br/>]</pre> | no |
 | <a name="input_cloud_monitoring_container_filter"></a> [cloud\_monitoring\_container\_filter](#input\_cloud\_monitoring\_container\_filter) | To filter custom containers, specify which containers to include or exclude from metrics collection for the cloud monitoring agent. See https://cloud.ibm.com/docs/monitoring?topic=monitoring-change_kube_agent#change_kube_agent_filter_data. | <pre>list(object({<br/>    type      = string<br/>    parameter = string<br/>    name      = string<br/>  }))</pre> | `[]` | no |
 | <a name="input_cloud_monitoring_endpoint_type"></a> [cloud\_monitoring\_endpoint\_type](#input\_cloud\_monitoring\_endpoint\_type) | Specify the IBM Cloud Monitoring instance endpoint type (public or private) to use. Used to construct the ingestion endpoint. | `string` | `"private"` | no |
+| <a name="input_cloud_monitoring_image_tag_digest"></a> [cloud\_monitoring\_image\_tag\_digest](#input\_cloud\_monitoring\_image\_tag\_digest) | The image tag digest to use for the Cloud Monitoring agent. | `string` | `"13.8.1@sha256:e5d1c63edf07c9f861249432c00873e32141381c15fbcff80b90a12b272dc0b9"` | no |
 | <a name="input_cloud_monitoring_instance_region"></a> [cloud\_monitoring\_instance\_region](#input\_cloud\_monitoring\_instance\_region) | The IBM Cloud Monitoring instance region. Used to construct the ingestion endpoint. | `string` | n/a | yes |
 | <a name="input_cloud_monitoring_metrics_filter"></a> [cloud\_monitoring\_metrics\_filter](#input\_cloud\_monitoring\_metrics\_filter) | To filter custom metrics, specify the Cloud Monitoring metrics to include or to exclude. See https://cloud.ibm.com/docs/monitoring?topic=monitoring-change_kube_agent#change_kube_agent_inc_exc_metrics. | <pre>list(object({<br/>    type = string<br/>    name = string<br/>  }))</pre> | `[]` | no |
 | <a name="input_cluster_config_endpoint_type"></a> [cluster\_config\_endpoint\_type](#input\_cluster\_config\_endpoint\_type) | Specify which type of endpoint to use for for cluster config access: 'default', 'private', 'vpe', 'link'. 'default' value will use the default endpoint of the cluster. | `string` | `"default"` | no |

ibm_catalog.json

@@ -92,6 +92,14 @@
               "key": "cloud_monitoring_access_key",
               "required": true
             },
+            {
+              "key": "cloud_monitoring_agent_registry",
+              "required": true
+            },
+            {
+              "key": "cloud_monitoring_image_tag_digest",
+              "required": true
+            },
             {
               "key": "cloud_monitoring_instance_region",
               "required": true,

main.tf

@@ -61,6 +61,16 @@ resource "helm_release" "cloud_monitoring_agent" {
     type  = "string"
     value = local.cluster_name
   }
+  set {
+    name  = "image.version"
+    type  = "string"
+    value = var.cloud_monitoring_image_tag_digest
+  }
+  set {
+    name  = "image.registry"
+    type  = "string"
+    value = var.cloud_monitoring_agent_registry
+  }
 
   values = [yamlencode({
     metrics_filter = var.cloud_monitoring_metrics_filter

solutions/fully-configurable/main.tf

@@ -28,4 +28,6 @@ module "monitoring_agent" {
   chart                              = var.chart
   chart_location                     = var.chart_location
   chart_version                      = var.chart_version
+  cloud_monitoring_agent_registry    = var.cloud_monitoring_agent_registry
+  cloud_monitoring_image_tag_digest  = var.cloud_monitoring_image_tag_digest
 }

solutions/fully-configurable/variables.tf

@@ -131,3 +131,17 @@ variable "chart_version" {
   default     = "1.79.0" # Replace with the desired version
   nullable    = false
 }
+
+variable "cloud_monitoring_agent_registry" {
+  description = "The image registry to use for the Cloud Monitoring agent."
+  type        = string
+  default     = "icr.io/ext/sysdig/agent"
+  nullable    = false
+}
+
+variable "cloud_monitoring_image_tag_digest" {
+  description = "The image tag digest to use for the Cloud Monitoring agent."
+  type        = string
+  default     = "13.8.1@sha256:e5d1c63edf07c9f861249432c00873e32141381c15fbcff80b90a12b272dc0b9" # datasource: icr.io/ext/sysdig/agent
+  nullable    = false
+}

variables.tf

@@ -159,3 +159,17 @@ variable "chart_version" {
   default     = "1.79.0" # Replace with the desired version
   nullable    = false
 }
+
+variable "cloud_monitoring_agent_registry" {
+  description = "The image registry to use for the Cloud Monitoring agent."
+  type        = string
+  default     = "icr.io/ext/sysdig/agent"
+  nullable    = false
+}
+
+variable "cloud_monitoring_image_tag_digest" {
+  description = "The image tag digest to use for the Cloud Monitoring agent."
+  type        = string
+  default     = "13.8.1@sha256:e5d1c63edf07c9f861249432c00873e32141381c15fbcff80b90a12b272dc0b9" # datasource: icr.io/ext/sysdig/agent
+  nullable    = false
+}