diff --git a/all.jsonnet b/all.jsonnet index edea37dd..34885bf3 100644 --- a/all.jsonnet +++ b/all.jsonnet @@ -230,7 +230,7 @@ local finalQ = t.query(q.config { { ['thanos-bucket-replicate-' + name]: br[name] for name in std.objectFields(br) if br[name] != null } + { ['thanos-compact-' + name]: c[name] for name in std.objectFields(c) if c[name] != null } + { - ['compact-' + shard + '-' + name]: cs.shards[shard][name] + ['thanos-compact-' + shard + '-' + name]: cs.shards[shard][name] for shard in std.objectFields(cs.shards) for name in std.objectFields(cs.shards[shard]) if cs.shards[shard][name] != null @@ -248,13 +248,11 @@ local finalQ = t.query(q.config { if rcvs.hashrings[hashring][name] != null } + { - ['store-' + shard + '-' + name]: strs.shards[shard][name] + ['thanos-store-' + shard + '-' + name]: strs.shards[shard][name] for shard in std.objectFields(strs.shards) for name in std.objectFields(strs.shards[shard]) if strs.shards[shard][name] != null } + -{ - 'compact-shards-serviceMonitor': cs.serviceMonitor, - 'store-shards-serviceMonitor': strs.serviceMonitor, - 'receive-hashrings-serviceMonitor': rcvs.serviceMonitor, -} +{ ['thanos-compact-shards-' + name]: cs[name] for name in std.objectFields(cs) if name != 'shards' && cs[name] != null } + +{ ['thanos-receive-hashrings-' + name]: rcvs[name] for name in std.objectFields(rcvs) if name != 'hashrings' && rcvs[name] != null } + +{ ['thanos-store-shards-' + name]: strs[name] for name in std.objectFields(strs) if name != 'shards' && strs[name] != null } diff --git a/examples/all/manifests/compact-shard0-service.yaml b/examples/all/manifests/thanos-compact-shard0-service.yaml similarity index 100% rename from examples/all/manifests/compact-shard0-service.yaml rename to examples/all/manifests/thanos-compact-shard0-service.yaml diff --git a/examples/all/manifests/compact-shard0-statefulSet.yaml b/examples/all/manifests/thanos-compact-shard0-statefulSet.yaml similarity index 100% rename from examples/all/manifests/compact-shard0-statefulSet.yaml rename to examples/all/manifests/thanos-compact-shard0-statefulSet.yaml diff --git a/examples/all/manifests/compact-shard1-service.yaml b/examples/all/manifests/thanos-compact-shard1-service.yaml similarity index 100% rename from examples/all/manifests/compact-shard1-service.yaml rename to examples/all/manifests/thanos-compact-shard1-service.yaml diff --git a/examples/all/manifests/compact-shard1-statefulSet.yaml b/examples/all/manifests/thanos-compact-shard1-statefulSet.yaml similarity index 100% rename from examples/all/manifests/compact-shard1-statefulSet.yaml rename to examples/all/manifests/thanos-compact-shard1-statefulSet.yaml diff --git a/examples/all/manifests/compact-shard2-service.yaml b/examples/all/manifests/thanos-compact-shard2-service.yaml similarity index 100% rename from examples/all/manifests/compact-shard2-service.yaml rename to examples/all/manifests/thanos-compact-shard2-service.yaml diff --git a/examples/all/manifests/compact-shard2-statefulSet.yaml b/examples/all/manifests/thanos-compact-shard2-statefulSet.yaml similarity index 100% rename from examples/all/manifests/compact-shard2-statefulSet.yaml rename to examples/all/manifests/thanos-compact-shard2-statefulSet.yaml diff --git a/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml b/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml new file mode 100644 index 00000000..86528dd6 --- /dev/null +++ b/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: database-compactor + app.kubernetes.io/instance: thanos-compact + app.kubernetes.io/name: thanos-compact + app.kubernetes.io/version: v0.22.0 + name: thanos-compact + namespace: thanos diff --git a/examples/all/manifests/compact-shards-serviceMonitor.yaml b/examples/all/manifests/thanos-compact-shards-serviceMonitor.yaml similarity index 100% rename from examples/all/manifests/compact-shards-serviceMonitor.yaml rename to examples/all/manifests/thanos-compact-shards-serviceMonitor.yaml diff --git a/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml b/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml new file mode 100644 index 00000000..81d144d8 --- /dev/null +++ b/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: database-write-hashring + app.kubernetes.io/instance: thanos-receive + app.kubernetes.io/name: thanos-receive + app.kubernetes.io/version: v0.22.0 + name: thanos-receive + namespace: thanos diff --git a/examples/all/manifests/receive-hashrings-serviceMonitor.yaml b/examples/all/manifests/thanos-receive-hashrings-serviceMonitor.yaml similarity index 100% rename from examples/all/manifests/receive-hashrings-serviceMonitor.yaml rename to examples/all/manifests/thanos-receive-hashrings-serviceMonitor.yaml diff --git a/examples/all/manifests/store-shard0-service.yaml b/examples/all/manifests/thanos-store-shard0-service.yaml similarity index 100% rename from examples/all/manifests/store-shard0-service.yaml rename to examples/all/manifests/thanos-store-shard0-service.yaml diff --git a/examples/all/manifests/store-shard0-statefulSet.yaml b/examples/all/manifests/thanos-store-shard0-statefulSet.yaml similarity index 100% rename from examples/all/manifests/store-shard0-statefulSet.yaml rename to examples/all/manifests/thanos-store-shard0-statefulSet.yaml diff --git a/examples/all/manifests/store-shard1-service.yaml b/examples/all/manifests/thanos-store-shard1-service.yaml similarity index 100% rename from examples/all/manifests/store-shard1-service.yaml rename to examples/all/manifests/thanos-store-shard1-service.yaml diff --git a/examples/all/manifests/store-shard1-statefulSet.yaml b/examples/all/manifests/thanos-store-shard1-statefulSet.yaml similarity index 100% rename from examples/all/manifests/store-shard1-statefulSet.yaml rename to examples/all/manifests/thanos-store-shard1-statefulSet.yaml diff --git a/examples/all/manifests/store-shard2-service.yaml b/examples/all/manifests/thanos-store-shard2-service.yaml similarity index 100% rename from examples/all/manifests/store-shard2-service.yaml rename to examples/all/manifests/thanos-store-shard2-service.yaml diff --git a/examples/all/manifests/store-shard2-statefulSet.yaml b/examples/all/manifests/thanos-store-shard2-statefulSet.yaml similarity index 100% rename from examples/all/manifests/store-shard2-statefulSet.yaml rename to examples/all/manifests/thanos-store-shard2-statefulSet.yaml diff --git a/examples/all/manifests/thanos-store-shards-serviceAccount.yaml b/examples/all/manifests/thanos-store-shards-serviceAccount.yaml new file mode 100644 index 00000000..783637e1 --- /dev/null +++ b/examples/all/manifests/thanos-store-shards-serviceAccount.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: object-store-gateway + app.kubernetes.io/instance: thanos-store + app.kubernetes.io/name: thanos-store + app.kubernetes.io/version: v0.22.0 + name: thanos-store + namespace: thanos diff --git a/examples/all/manifests/store-shards-serviceMonitor.yaml b/examples/all/manifests/thanos-store-shards-serviceMonitor.yaml similarity index 100% rename from examples/all/manifests/store-shards-serviceMonitor.yaml rename to examples/all/manifests/thanos-store-shards-serviceMonitor.yaml