Merge branch 'dev' into feat/dora-metrics

fix dashboard

Author: zjaco13

packages/grafana/manifests/devlake.yaml

@@ -9,7 +9,7 @@ spec:
   instanceSelector:
     matchLabels:
       dashboards: "external-grafana"
-  url: "https://github.com/apache/incubator-devlake/tree/main/grafana/dashboards/DORA.json"
+  url: "https://raw.githubusercontent.com/apache/incubator-devlake/tree/main/grafana/dashboards/DORA.json"
 ---
 # apiVersion: grafana.integreatly.org/v1beta1
 # kind: GrafanaDashboard

platform/infra/terraform/database/ec2/main.tf

@@ -234,13 +234,38 @@ resource "aws_ssm_document" "session_manager_prefs" {
   })
 }
 
+# Get latest SQL Server AMI
+data "aws_ami" "sql_server" {
+  most_recent = true
+  owners      = ["amazon"]  # AWS-owned AMIs
+
+  filter {
+    name   = "name"
+    values = ["Windows_Server-2022-English-Full-SQL_2019_Standard*"]  # Adjust version as needed
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "root-device-type"
+    values = ["ebs"]
+  }
+
+  filter {
+    name   = "state"
+    values = ["available"]
+  }
+}
+
 resource "aws_instance" "sql_server_instance" {
-  ami           = "ami-0848f4d849e5b4667"
-  instance_type = "t3a.xlarge"
+  ami           = data.aws_ami.sql_server.id
+  instance_type = "t3a.2xlarge"
   #subnet_id     = var.vpc_private_subnets[0]
   subnet_id     = length(var.vpc_private_subnets) > 0 ? var.vpc_private_subnets[0] : null
 
-
   vpc_security_group_ids = [aws_security_group.ec2_sg.id]
 
   root_block_device {
@@ -308,6 +333,28 @@ resource "aws_instance" "sql_server_instance" {
               Start-Sleep -Seconds 60
               Invoke-WebRequest -Uri $jreUrl -OutFile "C:\jre-installer.exe"
               Start-Process -FilePath "C:\jre-installer.exe" -ArgumentList "/s" -Wait
+
+              # Verify Java installation
+              $javaVersion = java -version 2>&1
+              Write-Host "Java version installed: $javaVersion"
+
+              # Optional: Set JAVA_HOME environment variable
+              [Environment]::SetEnvironmentVariable(
+                  "JAVA_HOME",
+                  (Get-ChildItem "C:\Program Files\Java\jre*" | Select-Object -First 1).FullName,
+                  [EnvironmentVariableTarget]::Machine
+              )
+
+              # Add Java to system PATH
+              $javaPath = "$env:JAVA_HOME\bin"
+              $currentPath = [Environment]::GetEnvironmentVariable("Path", [EnvironmentVariableTarget]::Machine)
+              if (-not $currentPath.Contains($javaPath)) {
+                  [Environment]::SetEnvironmentVariable(
+                      "Path",
+                      "$currentPath;$javaPath",
+                      [EnvironmentVariableTarget]::Machine
+                  )
+              }
  
               # Install Babelfish Compass
               $owner = "babelfish-for-postgresql"

platform/infra/terraform/mgmt/terraform/ack.tf

@@ -29,8 +29,6 @@ resource "kubectl_manifest" "application_argocd_ack" {
   )
 
   provisioner "local-exec" {
-    when = create
-
     command = "kubectl wait --for=jsonpath=.status.health.status=Healthy -n argocd application/ack --timeout=300s &&  kubectl wait --for=jsonpath=.status.sync.status=Synced --timeout=300s -n argocd application/ack"
 
     interpreter = ["/bin/bash", "-c"]

platform/infra/terraform/mgmt/terraform/mgmt-cluster/auto-mode.yaml

@@ -0,0 +1,51 @@
+---
+apiVersion: eks.amazonaws.com/v1
+kind: NodeClass
+metadata:
+  name: modern-engineering-nodeclass
+spec:
+  role: "modern-engineering"
+  ephemeralStorage: # EKS Auto Mode section that handles temporary storage.
+    size: "50Gi"
+  subnetSelectorTerms:
+    - tags:
+        eks.amazonaws.com/discovery: modern-engineering
+  securityGroupSelectorTerms:
+    - tags:
+        eks.amazonaws.com/discovery: modern-engineering
+  tags:
+    eks.amazonaws.com/discovery: modern-engineering
+---
+apiVersion: karpenter.sh/v1
+kind: NodePool
+metadata:
+  name: modern-engineering-nodepool
+spec:
+  template:
+    spec:
+      nodeClassRef:
+        group: eks.amazonaws.com
+        kind: NodeClass
+        name: modern-engineering-nodeclass # Calls the NodeClass modern-engineering-nodeclass in this file.
+      requirements:
+        - key: "eks.amazonaws.com/instance-category"
+          operator: In
+          values: ["c", "m", "r"]
+        - key: "eks.amazonaws.com/instance-cpu"
+          operator: In
+          values: ["4", "8", "16", "32"]
+        - key: "eks.amazonaws.com/instance-hypervisor"
+          operator: In
+          values: ["nitro"]
+        - key: "kubernetes.io/arch"
+          operator: In
+          values: ["amd64"]
+        - key: "eks.amazonaws.com/instance-generation"
+          operator: Gt
+          values: ["2"]
+  limits:
+    cpu: "1000"
+  disruption:
+    consolidationPolicy: WhenEmpty
+    consolidateAfter: 300s
+  weight: 10