From 7d669a80269a07578c8e7b51368b0a31df5f9046 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 21 Sep 2025 08:11:22 -0400
Subject: [PATCH] Adding S3 storage for Signoz.

---
 app-configs/rinoa/signoz/clickhouse/cluster.ha.xml.j2     | 2 ++
 app-configs/rinoa/signoz/clickhouse/cluster.xml.j2        | 2 ++
 app-configs/rinoa/signoz/clickhouse/config.xml.j2         | 2 ++
 .../rinoa/signoz/clickhouse/custom-function.xml.j2        | 2 ++
 app-configs/rinoa/signoz/clickhouse/storage.xml.j2        | 8 +++++---
 app-configs/rinoa/signoz/clickhouse/users.xml.j2          | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app-configs/rinoa/signoz/clickhouse/cluster.ha.xml.j2 b/app-configs/rinoa/signoz/clickhouse/cluster.ha.xml.j2
index c2d4368..ec19431 100644
--- a/app-configs/rinoa/signoz/clickhouse/cluster.ha.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/cluster.ha.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <?xml version="1.0"?>
 <clickhouse>
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
diff --git a/app-configs/rinoa/signoz/clickhouse/cluster.xml.j2 b/app-configs/rinoa/signoz/clickhouse/cluster.xml.j2
index 3456393..115bd1a 100644
--- a/app-configs/rinoa/signoz/clickhouse/cluster.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/cluster.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <?xml version="1.0"?>
 <clickhouse>
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
diff --git a/app-configs/rinoa/signoz/clickhouse/config.xml.j2 b/app-configs/rinoa/signoz/clickhouse/config.xml.j2
index 1965ac3..2251d3b 100644
--- a/app-configs/rinoa/signoz/clickhouse/config.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/config.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <?xml version="1.0"?>
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
diff --git a/app-configs/rinoa/signoz/clickhouse/custom-function.xml.j2 b/app-configs/rinoa/signoz/clickhouse/custom-function.xml.j2
index b2b3f91..479ad4a 100644
--- a/app-configs/rinoa/signoz/clickhouse/custom-function.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/custom-function.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <functions>
     <function>
         <type>executable</type>
diff --git a/app-configs/rinoa/signoz/clickhouse/storage.xml.j2 b/app-configs/rinoa/signoz/clickhouse/storage.xml.j2
index 54ec497..bc77dd3 100644
--- a/app-configs/rinoa/signoz/clickhouse/storage.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/storage.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <?xml version="1.0"?>
 <clickhouse>
 <storage_configuration>
@@ -13,9 +15,9 @@
                 For GCS cold storage,
                     endpoint should be https://storage.googleapis.com/<bucket-name>/data/
                 -->
-            <endpoint>https://BUCKET-NAME.s3-REGION-NAME.amazonaws.com/data/</endpoint>
-            <access_key_id>ACCESS-KEY-ID</access_key_id>
-            <secret_access_key>SECRET-ACCESS-KEY</secret_access_key>
+            <endpoint>http://minio:9000/signoz/data</endpoint>
+            <access_key_id>{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['SIGNOZ_S3_ACCESS_KEY'] }}</access_key_id>
+            <secret_access_key>{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['SIGNOZ_S3_SECRET_KEY'] }}</secret_access_key>
             <!-- In case of S3, uncomment the below configuration in case you want to read
                 AWS credentials from the Environment variables if they exist. -->
             <!-- <use_environment_credentials>true</use_environment_credentials> -->
diff --git a/app-configs/rinoa/signoz/clickhouse/users.xml.j2 b/app-configs/rinoa/signoz/clickhouse/users.xml.j2
index f185620..799dcba 100644
--- a/app-configs/rinoa/signoz/clickhouse/users.xml.j2
+++ b/app-configs/rinoa/signoz/clickhouse/users.xml.j2
@@ -1,3 +1,5 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
 <?xml version="1.0"?>
 <clickhouse>
     <!-- See also the files in users.d directory where the settings can be overridden. -->
-- 
2.52.0