Merge pull request #83 from openinfradev/bugfix_thanos_sidecar

bugfix: thanos-sidecars handle raw data within 3h
openinfradev · Jun 20, 2021 · 04c9100 · 04c9100
2 parents 2070f27 + e77243e
commit 04c9100
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml
@@ -158,7 +158,7 @@ spec:
           objectStorageConfig:
             key: objstore.yml 
             name: TO_BE_FIXED # secret name
-          minTime: 2h
+          minTime: -3h
       service:
         nodePort: 30008
         type: NodePort
@@ -1217,7 +1217,7 @@ spec:
       access_key: TO_BE_FIXED
       secret_key: TO_BE_FIXED
     sidecarsService:
-      enabled: true
+      enabled: false
       type: NodePort
       nodePort: 30007
       name: TO_BE_FIXED

diff --git a/lma/base/site-values.yaml b/lma/base/site-values.yaml
@@ -194,13 +194,16 @@ charts:
     clusterDomain: $(clusterName)
     existingObjstoreSecret: $(thanosObjstoreSecret)
     query.nodeSelector: $(nodeSelector)
+    query.dnsDiscovery.sidecarsService: lma-thanos-discovery
+    # query.stores:
+    #   - lma-thanos-discovery.lma.svc.$(clusterName)
     queryFrontend.nodeSelector: $(nodeSelector)
     queryFrontend.service.type: NodePort
     queryFrontend.service.http.nodePort: 30007
     bucketweb.nodeSelector: $(nodeSelector)
     compactor.nodeSelector: $(nodeSelector)
     storegateway.nodeSelector: $(nodeSelector)
-    ruler.nodeSelector: $(nodeSelector)      
+    ruler.nodeSelector: $(nodeSelector)
 
     queryFrontend.config: |-
         type: IN-MEMORY
@@ -246,7 +249,6 @@ charts:
     minio.persistence.storageClass: $(storageClassName)
     minio.persistence.accessMode: ReadWriteOnce
     minio.persistence.size: 8Gi
-    query.dnsDiscovery.sidecarsService: thanos-sidecars
 
 - name: thanos-config
   override: