From e5ee51706249592797bfecf16b497cdc5c4724f2 Mon Sep 17 00:00:00 2001
From: Kevin Lewin <lewinke@amazon.com>
Date: Fri, 19 Jan 2024 16:03:45 -0500
Subject: [PATCH] gpu to nvidia

---
 modules/eks-monitoring/dashboards.tf | 12 ++++++------
 modules/eks-monitoring/locals.tf     | 12 ++++++------
 modules/eks-monitoring/main.tf       |  2 +-
 modules/eks-monitoring/variables.tf  |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/eks-monitoring/dashboards.tf b/modules/eks-monitoring/dashboards.tf
index deee5c27..d130e80d 100644
--- a/modules/eks-monitoring/dashboards.tf
+++ b/modules/eks-monitoring/dashboards.tf
@@ -95,23 +95,23 @@ YAML
   depends_on = [module.external_secrets]
 }
 
-# gpu dashboards
-resource "kubectl_manifest" "gpu_monitoring_dashboards" {
+# nvidia dashboards
+resource "kubectl_manifest" "nvidia_monitoring_dashboards" {
   yaml_body  = <<YAML
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: ${local.gpu_monitoring_config.flux_kustomization_name}
+  name: ${local.nvidia_monitoring_config.flux_kustomization_name}
   namespace: flux-system
 spec:
   interval: 1m0s
-  path: ${local.gpu_monitoring_config.flux_kustomization_path}
+  path: ${local.nvidia_monitoring_config.flux_kustomization_path}
   prune: true
   sourceRef:
     kind: GitRepository
-    name: ${local.gpu_monitoring_config.flux_gitrepository_name}
+    name: ${local.nvidia_monitoring_config.flux_gitrepository_name}
 YAML
-  count      = var.enable_gpu_monitoring ? 1 : 0
+  count      = var.enable_nvidia_monitoring ? 1 : 0
   depends_on = [module.external_secrets]
 }
 
diff --git a/modules/eks-monitoring/locals.tf b/modules/eks-monitoring/locals.tf
index baa18261..8b942520 100644
--- a/modules/eks-monitoring/locals.tf
+++ b/modules/eks-monitoring/locals.tf
@@ -132,13 +132,13 @@ locals {
     }
   }
 
-  gpu_monitoring_config = {
+  nvidia_monitoring_config = {
     # can be overriden by providing a config
-    flux_gitrepository_name   = try(var.gpu_monitoring_config.flux_gitrepository_name, var.flux_gitrepository_name)
-    flux_gitrepository_url    = try(var.gpu_monitoring_config.flux_gitrepository_url, var.flux_gitrepository_url)
-    flux_gitrepository_branch = try(var.gpu_monitoring_config.flux_gitrepository_branch, var.flux_gitrepository_branch)
-    flux_kustomization_name   = try(var.gpu_monitoring_config.flux_kustomization_name, "grafana-dashboards-adothealth")
-    flux_kustomization_path   = try(var.gpu_monitoring_config.flux_kustomization_path, "./artifacts/grafana-operator-manifests/eks/gpu")
+    flux_gitrepository_name   = try(var.nvidia_monitoring_config.flux_gitrepository_name, var.flux_gitrepository_name)
+    flux_gitrepository_url    = try(var.nvidia_monitoring_config.flux_gitrepository_url, var.flux_gitrepository_url)
+    flux_gitrepository_branch = try(var.nvidia_monitoring_config.flux_gitrepository_branch, var.flux_gitrepository_branch)
+    flux_kustomization_name   = try(var.nvidia_monitoring_config.flux_kustomization_name, "grafana-dashboards-adothealth")
+    flux_kustomization_path   = try(var.nvidia_monitoring_config.flux_kustomization_path, "./artifacts/grafana-operator-manifests/eks/gpu")
   }
 
   kubeproxy_monitoring_config = {
diff --git a/modules/eks-monitoring/main.tf b/modules/eks-monitoring/main.tf
index 2d8b04ab..c96525ee 100644
--- a/modules/eks-monitoring/main.tf
+++ b/modules/eks-monitoring/main.tf
@@ -198,7 +198,7 @@ module "helm_addon" {
     },
     {
       name  = "enableGpuMonitoring"
-      value = var.enable_gpu_monitoring
+      value = var.enable_nvidia_monitoring
     },
     {
       name  = "serviceAccount"
diff --git a/modules/eks-monitoring/variables.tf b/modules/eks-monitoring/variables.tf
index a0f1d225..34e7532c 100644
--- a/modules/eks-monitoring/variables.tf
+++ b/modules/eks-monitoring/variables.tf
@@ -552,14 +552,14 @@ variable "enable_adotcollector_metrics" {
   default     = true
 }
 
-variable "enable_gpu_monitoring" {
-  description = "Enables monitoring of GPU metrics"
+variable "enable_nvidia_monitoring" {
+  description = "Enables monitoring of nvidia metrics"
   type        = bool
   default     = true
 }
 
-variable "gpu_monitoring_config" {
-  description = "Config object for GPU monitoring"
+variable "nvidia_monitoring_config" {
+  description = "Config object for nvidia monitoring"
   type = object({
     flux_gitrepository_name   = string
     flux_gitrepository_url    = string