From 281a7da9d4c15a1a9d7e0da96c52d4f2d3cddb90 Mon Sep 17 00:00:00 2001
From: "Xavier Pillons (MSFT)" <xpillons@microsoft.com>
Date: Fri, 19 Jul 2024 15:41:38 +0200
Subject: [PATCH] add monitoring parameters

---
 bicep/files-to-load/initial_params.json |  5 ++++-
 bicep/files-to-load/slurm-workspace.txt | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/bicep/files-to-load/initial_params.json b/bicep/files-to-load/initial_params.json
index a03af5a..42fb4c9 100644
--- a/bicep/files-to-load/initial_params.json
+++ b/bicep/files-to-load/initial_params.json
@@ -83,5 +83,8 @@
     "HTCClusterInitSpecs": null,
     "SchedFilesystemSize": 30,
     "HPCMaxScalesetSize": 100,
-    "SchedulerHAZone": null
+    "SchedulerHAZone": null,
+    "EnableMonitoring": false,
+    "MonitoringClientId": null,
+    "MetricsIngestionEndpoint": null
 }
diff --git a/bicep/files-to-load/slurm-workspace.txt b/bicep/files-to-load/slurm-workspace.txt
index a0a1f35..de59b92 100644
--- a/bicep/files-to-load/slurm-workspace.txt
+++ b/bicep/files-to-load/slurm-workspace.txt
@@ -65,6 +65,11 @@ Autoscale = $Autoscale
         # May be used to identify the ID in cluster-init scripts
         cluster.identities.default = $ManagedIdentity
 
+        # Monitoring
+        monitoring.enabled = $EnableMonitoring
+        monitoring.identity_client_id = $MonitoringClientId
+        monitoring.ingestion_endpoint = $MetricsIngestionEndpoint
+
         [[[cluster-init cyclecloud/slurm:default:3.0.7]]]
         Optional = true
 
@@ -873,6 +878,26 @@ Order = 20
         ParameterType = Boolean
         DefaultValue = false
 	
+    [[parameters Monitoring]]
+        [[[parameter EnableMonitoring]]]
+        Label = Enable Monitoring
+        DefaultValue = false
+        ParameterType = Boolean
+        Config.Label = Enable monitoring for Scheduler, Login and compute nodes
+
+        [[[parameter MonitoringClientId]]]
+        Label = Managed Identity Client ID
+        Description = Client ID of the Managed Identity with Monitoring Metrics Publisher role
+        DefaultValue = ''
+        ParameterType = String
+        Conditions.Excluded := EnableMonitoring isnt true
+
+        [[[parameter MetricsIngestionEndpoint]]]
+        Label = Metrics Ingestion Endpoint
+        Description = The Azure Monitor Workspace in which to push metrics
+        DefaultValue = ''
+        ParameterType = String
+        Conditions.Excluded := EnableMonitoring isnt true
 
     [[parameters Advanced Networking]]