Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ac56ed4c0 |
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = "~> 6.0"
|
version = "~> 5.0"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = "~> 6.0"
|
version = "~> 5.0"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = "~> 6.0"
|
version = "~> 5.0"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = "~> 6.0"
|
version = "~> 5.0"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ spec:
|
|||||||
sources:
|
sources:
|
||||||
- repoURL: https://grafana.github.io/helm-charts
|
- repoURL: https://grafana.github.io/helm-charts
|
||||||
chart: grafana
|
chart: grafana
|
||||||
targetRevision: "10.5.15"
|
targetRevision: "8.15.0"
|
||||||
helm:
|
helm:
|
||||||
releaseName: grafana
|
releaseName: grafana
|
||||||
valueFiles:
|
valueFiles:
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ spec:
|
|||||||
sources:
|
sources:
|
||||||
- repoURL: https://prometheus-community.github.io/helm-charts
|
- repoURL: https://prometheus-community.github.io/helm-charts
|
||||||
chart: prometheus
|
chart: prometheus
|
||||||
targetRevision: "29.35.0"
|
targetRevision: "28.16.0"
|
||||||
helm:
|
helm:
|
||||||
releaseName: prometheus
|
releaseName: prometheus
|
||||||
valueFiles:
|
valueFiles:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ spec:
|
|||||||
sources:
|
sources:
|
||||||
- repoURL: https://traefik.github.io/charts
|
- repoURL: https://traefik.github.io/charts
|
||||||
chart: traefik
|
chart: traefik
|
||||||
targetRevision: "41.6.0"
|
targetRevision: "28.3.0"
|
||||||
helm:
|
helm:
|
||||||
releaseName: traefik
|
releaseName: traefik
|
||||||
valueFiles:
|
valueFiles:
|
||||||
|
|||||||
@@ -4,17 +4,14 @@ opencost:
|
|||||||
extraEnv:
|
extraEnv:
|
||||||
EMIT_KSM_V1_METRICS: "false"
|
EMIT_KSM_V1_METRICS: "false"
|
||||||
EMIT_KSM_V1_METRICS_ONLY: "true"
|
EMIT_KSM_V1_METRICS_ONLY: "true"
|
||||||
|
prometheus:
|
||||||
|
internal:
|
||||||
|
enabled: true
|
||||||
|
serviceName: prometheus-server
|
||||||
|
namespaceName: monitoring
|
||||||
|
port: 80
|
||||||
# Cloud-specific pricing is in per-cluster value overrides
|
# Cloud-specific pricing is in per-cluster value overrides
|
||||||
# (e.g. infra/values/upc-dev/opencost-values.yaml)
|
# (e.g. infra/values/upc-dev/opencost-values.yaml)
|
||||||
# NOTE: `prometheus` is a sibling of `exporter` under `opencost` in the
|
|
||||||
# chart's values schema - nesting it inside `exporter` silently falls back
|
|
||||||
# to the chart default namespace (prometheus-system).
|
|
||||||
prometheus:
|
|
||||||
internal:
|
|
||||||
enabled: true
|
|
||||||
serviceName: prometheus-server
|
|
||||||
namespaceName: monitoring
|
|
||||||
port: 80
|
|
||||||
ui:
|
ui:
|
||||||
enabled: false
|
enabled: false
|
||||||
service:
|
service:
|
||||||
|
|||||||
@@ -4,12 +4,6 @@ server:
|
|||||||
service:
|
service:
|
||||||
servicePort: 80
|
servicePort: 80
|
||||||
|
|
||||||
strategy:
|
|
||||||
type: Recreate
|
|
||||||
|
|
||||||
retention: 7d
|
|
||||||
retentionSize: 6GB
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 150m
|
cpu: 150m
|
||||||
@@ -24,7 +18,7 @@ server:
|
|||||||
|
|
||||||
extraScrapeConfigs: |
|
extraScrapeConfigs: |
|
||||||
- job_name: kyverno
|
- job_name: kyverno
|
||||||
scrape_interval: 60s
|
scrape_interval: 15s
|
||||||
metrics_path: /metrics
|
metrics_path: /metrics
|
||||||
kubernetes_sd_configs:
|
kubernetes_sd_configs:
|
||||||
- role: endpoints
|
- role: endpoints
|
||||||
@@ -41,16 +35,9 @@ extraScrapeConfigs: |
|
|||||||
target_label: pod
|
target_label: pod
|
||||||
- source_labels: [__meta_kubernetes_namespace]
|
- source_labels: [__meta_kubernetes_namespace]
|
||||||
target_label: namespace
|
target_label: namespace
|
||||||
metric_relabel_configs:
|
|
||||||
- source_labels: [__name__]
|
|
||||||
regex: 'kyverno_(http_requests_duration_seconds|controller_.+_duration_seconds|admission_review_duration_seconds)_bucket'
|
|
||||||
action: drop
|
|
||||||
- source_labels: [__name__]
|
|
||||||
regex: 'go_.*|process_.*'
|
|
||||||
action: drop
|
|
||||||
|
|
||||||
- job_name: traefik
|
- job_name: traefik
|
||||||
scrape_interval: 60s
|
scrape_interval: 15s
|
||||||
metrics_path: /metrics
|
metrics_path: /metrics
|
||||||
kubernetes_sd_configs:
|
kubernetes_sd_configs:
|
||||||
- role: endpoints
|
- role: endpoints
|
||||||
@@ -67,13 +54,6 @@ extraScrapeConfigs: |
|
|||||||
target_label: pod
|
target_label: pod
|
||||||
- source_labels: [__meta_kubernetes_namespace]
|
- source_labels: [__meta_kubernetes_namespace]
|
||||||
target_label: namespace
|
target_label: namespace
|
||||||
metric_relabel_configs:
|
|
||||||
- source_labels: [__name__]
|
|
||||||
regex: 'traefik_(router|service|entrypoint)_request_duration_seconds_bucket'
|
|
||||||
action: drop
|
|
||||||
- source_labels: [__name__]
|
|
||||||
regex: 'go_.*|process_.*'
|
|
||||||
action: drop
|
|
||||||
|
|
||||||
alertmanager:
|
alertmanager:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
Reference in New Issue
Block a user