Sangam-ghimire · Sangam-ghimire · Mar 23, 2025 · Mar 22, 2025 · Mar 22, 2025 · Mar 22, 2025
diff --git a/argocd/applications/prod/loki-stack-prod.yaml b/argocd/applications/prod/loki-stack-prod.yaml
diff --git a/argocd/applications/prod/prometheus-stack-prod.yaml b/argocd/applications/prod/prometheus-stack-prod.yaml
diff --git a/argocd/applications/shared/k8s-resources.yaml b/argocd/applications/shared/k8s-resources.yaml
@@ -7,7 +7,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/Sangam-ghimire/DevSecOps-FullJavaPipeline.git
-    targetRevision: dev-environment
+    targetRevision: main
     path: k8s
   destination:
     server: https://kubernetes.default.svc

diff --git a/argocd/applications/dev/loki-stack-dev.yaml → argocd/applications/shared/loki-stack.yaml b/argocd/applications/dev/loki-stack-dev.yaml → argocd/applications/shared/loki-stack.yaml
@@ -1,17 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: loki-stack-dev
+  name: loki-stack
   namespace: argocd
 spec:
   project: default
   source:
     repoURL: https://github.com/Sangam-ghimire/DevSecOps-FullJavaPipeline.git
-    targetRevision: dev-environment
+    targetRevision: main
     path: infra/logging/loki-stack
     helm:
       valueFiles:
-        - values-dev.yaml
+        - values.yaml
   destination:
     server: https://kubernetes.default.svc
     namespace: dev-monitoring-logging

diff --git a/...pplications/dev/prometheus-stack-dev.yaml → ...applications/shared/prometheus-stack.yaml b/...pplications/dev/prometheus-stack-dev.yaml → ...applications/shared/prometheus-stack.yaml
@@ -1,17 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: prometheus-stack-dev
+  name: prometheus-stack
   namespace: argocd
 spec:
   project: default
   source:
     repoURL: https://github.com/Sangam-ghimire/DevSecOps-FullJavaPipeline.git
-    targetRevision: dev-environment
+    targetRevision: main
     path: infra/monitoring/prometheus-stack
     helm:
       valueFiles:
-        - values-dev.yaml
+        - values.yaml
   destination:
     server: https://kubernetes.default.svc
     namespace: dev-monitoring-logging

diff --git a/infra/monitoring/grafana/values.yaml b/infra/monitoring/grafana/values.yaml
@@ -0,0 +1,17 @@
+grafana:
+  sidecar:
+    dashboards:
+      enabled: true
+      searchNamespace: ALL
+
+  dashboardsProvider:
+    enabled: true
+    configMaps:
+      java-dashboard: "java-app-dashboard"
+
+  dashboardsConfigMaps:
+    java-app-dashboard:
+      java-app-dashboard.json: |-
+        {{ .Files.Get "infra/monitoring/grafana-dashboards/java-app-dashboard.json" | indent 8 }}
+
+
diff --git a/infra/monitoring/prometheus-stack/Chart.yaml b/infra/monitoring/prometheus-stack/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prometheus-stack
 description: Prometheus Monitoring Stack
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.0.0"
 
 dependencies:

diff --git a/infra/monitoring/prometheus-stack/values-prod.yaml b/infra/monitoring/prometheus-stack/values-prod.yaml
diff --git a/...nitoring/prometheus-stack/values-dev.yaml → ...a/monitoring/prometheus-stack/values.yaml b/...nitoring/prometheus-stack/values-dev.yaml → ...a/monitoring/prometheus-stack/values.yaml
diff --git a/k8s/namespaces/prod/prod-monitoring-logging.yaml b/k8s/namespaces/prod/prod-monitoring-logging.yaml
diff --git a/...amespaces/dev/dev-monitoring-logging.yaml → ...namespaces/shared/monitoring-logging.yaml b/...amespaces/dev/dev-monitoring-logging.yaml → ...namespaces/shared/monitoring-logging.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: dev-monitoring-logging
+  name: monitoring-logging
   labels:
     argocd.argoproj.io/instance: k8s-resources
diff --git a/terraform/environments/dev&prod(namespace separated usecase)/terraform.tfvars b/terraform/environments/dev&prod(namespace separated usecase)/terraform.tfvars
@@ -7,9 +7,9 @@ environment = "dev"
 aws_profile = "treeleafai"
 aws_region = "ap-south-1"
 
-max_size = 3
+max_size = 4
 min_size = 1
-desired_size = 2
+desired_size = 3
 
 instance_types = [ "t3.medium" ]