diff --git a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/alerts.libsonnet b/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/alerts.libsonnet deleted file mode 100644 index e378df18e..000000000 --- a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/alerts.libsonnet +++ /dev/null @@ -1,82 +0,0 @@ -{ - prometheusAlerts+:: { - groups+: [ - { - name: 'kube-state-metrics', - rules: [ - { - alert: 'KubeStateMetricsListErrors', - expr: ||| - (sum(rate(kube_state_metrics_list_total{%(kubeStateMetricsSelector)s,result="error"}[5m])) by (%(clusterLabel)s) - / - sum(rate(kube_state_metrics_list_total{%(kubeStateMetricsSelector)s}[5m])) by (%(clusterLabel)s)) - > 0.01 - ||| % $._config, - 'for': '15m', - labels: { - severity: 'critical', - }, - annotations: { - summary: 'kube-state-metrics is experiencing errors in list operations.', - description: 'kube-state-metrics is experiencing errors at an elevated rate in list operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all.', - }, - }, - { - alert: 'KubeStateMetricsWatchErrors', - expr: ||| - (sum(rate(kube_state_metrics_watch_total{%(kubeStateMetricsSelector)s,result="error"}[5m])) by (%(clusterLabel)s) - / - sum(rate(kube_state_metrics_watch_total{%(kubeStateMetricsSelector)s}[5m])) by (%(clusterLabel)s)) - > 0.01 - ||| % $._config, - 'for': '15m', - labels: { - severity: 'critical', - }, - annotations: { - summary: 'kube-state-metrics is experiencing errors in watch operations.', - description: 'kube-state-metrics is experiencing errors at an elevated rate in watch operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all.', - }, - }, - { - alert: 'KubeStateMetricsShardingMismatch', - // - expr: ||| - stdvar (kube_state_metrics_total_shards{%(kubeStateMetricsSelector)s}) by (%(clusterLabel)s) != 0 - ||| % $._config, - 'for': '15m', - labels: { - severity: 'critical', - }, - annotations: { - summary: 'kube-state-metrics sharding is misconfigured.', - description: 'kube-state-metrics pods are running with different --total-shards configuration, some Kubernetes objects may be exposed multiple times or not exposed at all.', - }, - }, - { - alert: 'KubeStateMetricsShardsMissing', - // Each shard ordinal is assigned a binary position (2^ordinal) and we compute a sum of those. - // This sum is compared to the expected number (2^total_shards - 1). - // Result of zero all shards are being scraped, anything else indicates an issue. - // A handy side effect of this computation is the result indicates what ordinals are missing. - // Eg. a result of "5" decimal, which translates to binary "101", means shards #0 and #2 are not available. - expr: ||| - 2^max(kube_state_metrics_total_shards{%(kubeStateMetricsSelector)s}) by (%(clusterLabel)s) - 1 - - - sum( 2 ^ max by (%(clusterLabel)s, shard_ordinal) (kube_state_metrics_shard_ordinal{%(kubeStateMetricsSelector)s}) ) by (%(clusterLabel)s) - != 0 - ||| % $._config, - 'for': '15m', - labels: { - severity: 'critical', - }, - annotations: { - summary: 'kube-state-metrics shards are missing.', - description: 'kube-state-metrics shards are missing, some Kubernetes objects are not being exposed.', - }, - }, - ], - }, - ], - }, -} diff --git a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/config.libsonnet b/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/config.libsonnet deleted file mode 100644 index f4e66f12f..000000000 --- a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/config.libsonnet +++ /dev/null @@ -1,7 +0,0 @@ -{ - _config+:: { - // Select the metrics coming from the kube state metrics. - kubeStateMetricsSelector: 'job="kube-state-metrics"', - clusterLabel: 'cluster', - }, -} diff --git a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet b/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet deleted file mode 100644 index 95efe331f..000000000 --- a/monitoring/vendor/github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -(import 'config.libsonnet') + -(import 'alerts.libsonnet') diff --git a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-query.libsonnet b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-query.libsonnet index 1b7e623ff..9358510f9 100644 --- a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-query.libsonnet +++ b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-query.libsonnet @@ -10,7 +10,7 @@ local defaults = { imagePullPolicy: 'IfNotPresent', replicas: error 'must provide replicas', replicaLabels: error 'must provide replicaLabels', - stores: ['dnssrv+_grpc._tcp.thanos-store.%s.svc.cluster.local' % defaults.namespace], + stores: ['dnssrv+_grpc._tcp.thanos-store.%s' % defaults.namespace], rules: [], // TODO(bwplotka): This is deprecated, switch to endpoints while ready. externalPrefix: '', queryUrl: '', diff --git a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet index 2b3a04e01..e73c088fa 100644 --- a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet +++ b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet @@ -33,7 +33,6 @@ ], tenantLabelName: null, tenantHeader: null, - clusterDomain: 'cluster.local', extraEnv: [], receiveLimitsConfigFile: {}, storeLimits: {}, diff --git a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-ingestor.libsonnet b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-ingestor.libsonnet index 5940c8b71..ba6819fde 100644 --- a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-ingestor.libsonnet +++ b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive-ingestor.libsonnet @@ -23,13 +23,13 @@ function(params) { }, storeEndpoints:: [ - 'dnssrv+_grpc._tcp.%s.%s.svc.cluster.local:%d' % [ingestors.hashrings[name.hashring].service.metadata.name, tr.config.namespace, tr.config.ports.grpc] + 'dnssrv+_grpc._tcp.%s.%s:%d' % [ingestors.hashrings[name.hashring].service.metadata.name, tr.config.namespace, tr.config.ports.grpc] for name in tr.config.hashrings ], endpoints:: { [name.hashring]: [ - '%s-%d.%s.%s.svc.cluster.local:%d' % [ + '%s-%d.%s.%s:%d' % [ ingestors.hashrings[name.hashring].service.metadata.name, i, ingestors.hashrings[name.hashring].service.metadata.name, diff --git a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive.libsonnet index 56233f867..0196a39b9 100644 --- a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive.libsonnet +++ b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-receive.libsonnet @@ -53,9 +53,8 @@ function(params) { }, statefulSet: - local localEndpointFlag = '--receive.local-endpoint=$(NAME).%s.$(NAMESPACE).svc.%s:%d' % [ + local localEndpointFlag = '--receive.local-endpoint=$(NAME).%s.$(NAMESPACE):%d' % [ tr.config.name, - tr.config.clusterDomain, tr.config.ports.grpc, ]; diff --git a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 8ab36e58f..c4a09a757 100644 --- a/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/monitoring/vendor/github.com/thanos-io/kube-thanos/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -253,5 +253,5 @@ function(params) { ], }, }, - storeEndpoint:: 'dnssrv+_grpc._tcp.%s.%s.svc.cluster.local:%d' % [ts.service.metadata.name, ts.config.namespace, ts.config.ports.grpc], + storeEndpoint:: 'dnssrv+_grpc._tcp.%s.%s:%d' % [ts.service.metadata.name, ts.config.namespace, ts.config.ports.grpc], } diff --git a/parca-devel/jsonnetfile.lock.json b/parca-devel/jsonnetfile.lock.json index 078b6e8b8..f75d30e99 100644 --- a/parca-devel/jsonnetfile.lock.json +++ b/parca-devel/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "scrape-configs" } }, - "version": "9fc1b0151dac7026e74f04688d737fa5bbce0a6c", + "version": "bd1187300d379d1fb1b2fd474e1d382e68b206f2", "sum": "9Sl1vzn4bXH/NvdjSXEVtuq9joATwmh3S+8N5WmOO2U=" }, { @@ -18,7 +18,7 @@ "subdir": "deploy/lib/parca-agent" } }, - "version": "f4066936a3f733693a61ac547472cf3e2a6aba98", + "version": "245118730c9b56fe84666de90e174d2b0c7c332c", "sum": "2lFeo1cibXb6qfaDC+ELdb9v4U2R9//1rbSuRn564MQ=" }, { @@ -28,7 +28,7 @@ "subdir": "deploy/lib/parca" } }, - "version": "49b2a23d58b63ce07cbdcbeed8ea34fd223ee40e", + "version": "40293ed78af5fd50d58b83a751435cf2652c20f1", "sum": "3jHwGjkrJ39XMNlGNMS+/O3CbW+Dl6CuwH1Xp0sL4M0=" } ],