Merge branch 'hammerhead/update' into dependabot/go_modules/test/gith…

…ub.com/stretchr/testify-1.10.0
crate · Dec 2, 2024 · 7f13412 · 7f13412
2 parents c09642a + c98e402
commit 7f13412
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/aws/.terraform.lock.hcl b/aws/.terraform.lock.hcl
diff --git a/aws/.tflint.hcl b/aws/.tflint.hcl
@@ -1,6 +1,6 @@
 plugin "aws" {
   enabled = true
-  version = "0.33.0"
+  version = "0.35.0"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/aws/scripts/cloud-init-cratedb-rpm.tftpl b/aws/scripts/cloud-init-cratedb-rpm.tftpl
@@ -25,6 +25,7 @@ packages:
   - htop
   - node_exporter
   - jq
+  - nano
 
 bootcmd:
   - test -z "$(blkid /dev/nvme1n1)" && mkfs -t xfs -L data /dev/nvme1n1
@@ -91,7 +92,7 @@ write_files:
       CRATE_HEAP_SIZE=${crate_heap_size}g
 
       # Additional Java options
-      CRATE_JAVA_OPTS="-javaagent:/usr/share/crate/crate-jmx-exporter-1.1.0.jar=8080"
+      CRATE_JAVA_OPTS="-javaagent:/usr/share/crate/crate-jmx-exporter-1.2.0.jar=8080"
     owner: root:root
     path: /etc/default/crate
     permissions: "0755"
@@ -113,7 +114,7 @@ runcmd:
   - dnf install -y crate
   - chown -R crate:crate /opt/data /etc/crate
   - chmod 700 /opt/data
-  - curl --output-dir /usr/share/crate -O https://repo1.maven.org/maven2/io/crate/crate-jmx-exporter/1.1.0/crate-jmx-exporter-1.1.0.jar
+  - curl --output-dir /usr/share/crate -O https://repo1.maven.org/maven2/io/crate/crate-jmx-exporter/1.2.0/crate-jmx-exporter-1.2.0.jar
   - systemctl enable crate
   - systemctl start crate
   - bash /opt/deployment/user_provisioning.sh "${crate_protocol}" "${crate_user}" "${crate_pass}" && rm -f /opt/deployment/user_provisioning.sh

diff --git a/aws/scripts/cloud-init-cratedb-tar.tftpl b/aws/scripts/cloud-init-cratedb-tar.tftpl
@@ -16,6 +16,7 @@ packages:
   - openssl
   - htop
   - node_exporter
+  - nano
 
 bootcmd:
   - test -z "$(blkid /dev/nvme1n1)" && mkfs -t xfs -L data /dev/nvme1n1

diff --git a/aws/scripts/cloud-init-utilities.tftpl b/aws/scripts/cloud-init-utilities.tftpl
@@ -30,7 +30,7 @@ write_files:
       done
 
       sudo -i -u ec2-user bash << EOF
-        curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash
+        curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
         source ~/.bashrc
 
         nvm install node --latest-npm
@@ -61,8 +61,8 @@ write_files:
     permissions: "0666"
   - content: |
       global:
-        scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-        evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+        scrape_interval:     5s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+        evaluation_interval: 5s # Evaluate rules every 15 seconds. The default is every 1 minute.
 
       scrape_configs:
         - job_name: cratedb
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ packages: @@
       - openssl
       - htop
       - node_exporter
+      - nano
     bootcmd:
       - test -z "$(blkid /dev/nvme1n1)" && mkfs -t xfs -L data /dev/nvme1n1
@@ Expand Down @@