Skip to content

Commit

Permalink
Merge branch 'master' into release-0.34
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielhoherd
danielhoherd committed Feb 22, 2024
2 parents d1ff5aa + 53e30bd commit 187b8ff
Show file tree
Hide file tree
Showing 17 changed files with 119 additions and 62 deletions.
76 changes: 38 additions & 38 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,37 +359,37 @@ workflows:
docker_image:
- quay.io/astronomer/ap-alertmanager:0.26.0
- quay.io/astronomer/ap-astro-ui:0.34.3
- quay.io/astronomer/ap-auth-sidecar:1.25.2-3
- quay.io/astronomer/ap-awsesproxy:1.5.0-6
- quay.io/astronomer/ap-base:3.18.5
- quay.io/astronomer/ap-blackbox-exporter:0.24.0-5
- quay.io/astronomer/ap-cli-install:0.26.21
- quay.io/astronomer/ap-auth-sidecar:1.25.3-1
- quay.io/astronomer/ap-awsesproxy:1.5.0-7
- quay.io/astronomer/ap-base:3.18.6
- quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
- quay.io/astronomer/ap-cli-install:0.26.22
- quay.io/astronomer/ap-commander:0.34.0
- quay.io/astronomer/ap-configmap-reloader:0.12.0
- quay.io/astronomer/ap-curator:8.0.8-6
- quay.io/astronomer/ap-db-bootstrapper:0.31.10
- quay.io/astronomer/ap-default-backend:0.28.22
- quay.io/astronomer/ap-curator:8.0.8-7
- quay.io/astronomer/ap-db-bootstrapper:0.31.11
- quay.io/astronomer/ap-default-backend:0.28.23
- quay.io/astronomer/ap-elasticsearch-exporter:1.7.0
- quay.io/astronomer/ap-elasticsearch:8.11.4
- quay.io/astronomer/ap-fluentd:1.16.3
- quay.io/astronomer/ap-grafana:10.2.3
- quay.io/astronomer/ap-houston-api:0.34.4
- quay.io/astronomer/ap-init:3.18.5
- quay.io/astronomer/ap-init:3.18.6
- quay.io/astronomer/ap-kibana:8.11.4
- quay.io/astronomer/ap-kube-state:2.10.1
- quay.io/astronomer/ap-nats-exporter:0.14.0
- quay.io/astronomer/ap-nats-server:2.10.9-1
- quay.io/astronomer/ap-nats-streaming:0.25.6
- quay.io/astronomer/ap-nginx-es:1.25.3
- quay.io/astronomer/ap-nats-exporter:0.14.0-1
- quay.io/astronomer/ap-nats-server:2.10.9-2
- quay.io/astronomer/ap-nats-streaming:0.25.6-1
- quay.io/astronomer/ap-nginx-es:1.25.3-1
- quay.io/astronomer/ap-nginx:1.9.5
- quay.io/astronomer/ap-node-exporter:1.7.0
- quay.io/astronomer/ap-openresty:1.25.3
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-9
- quay.io/astronomer/ap-postgres-exporter:0.15.0-3
- quay.io/astronomer/ap-postgresql:15.5.0
- quay.io/astronomer/ap-openresty:1.25.3-1
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-10
- quay.io/astronomer/ap-postgres-exporter:0.15.0-4
- quay.io/astronomer/ap-postgresql:15.5.0-1
- quay.io/astronomer/ap-prometheus:2.45.3
- quay.io/astronomer/ap-registry:3.18.5-1
- quay.io/astronomer/ap-vector:0.32.2-3
- quay.io/astronomer/ap-registry:3.18.6
- quay.io/astronomer/ap-vector:0.32.2-4
context:
- slack_team-software-infra-bot
- twistcli-scan-docker:
Expand All @@ -398,37 +398,37 @@ workflows:
docker_image:
- quay.io/astronomer/ap-alertmanager:0.26.0
- quay.io/astronomer/ap-astro-ui:0.34.3
- quay.io/astronomer/ap-auth-sidecar:1.25.2-3
- quay.io/astronomer/ap-awsesproxy:1.5.0-6
- quay.io/astronomer/ap-base:3.18.5
- quay.io/astronomer/ap-blackbox-exporter:0.24.0-5
- quay.io/astronomer/ap-cli-install:0.26.21
- quay.io/astronomer/ap-auth-sidecar:1.25.3-1
- quay.io/astronomer/ap-awsesproxy:1.5.0-7
- quay.io/astronomer/ap-base:3.18.6
- quay.io/astronomer/ap-blackbox-exporter:0.24.0-6
- quay.io/astronomer/ap-cli-install:0.26.22
- quay.io/astronomer/ap-commander:0.34.0
- quay.io/astronomer/ap-configmap-reloader:0.12.0
- quay.io/astronomer/ap-curator:8.0.8-6
- quay.io/astronomer/ap-db-bootstrapper:0.31.10
- quay.io/astronomer/ap-default-backend:0.28.22
- quay.io/astronomer/ap-curator:8.0.8-7
- quay.io/astronomer/ap-db-bootstrapper:0.31.11
- quay.io/astronomer/ap-default-backend:0.28.23
- quay.io/astronomer/ap-elasticsearch-exporter:1.7.0
- quay.io/astronomer/ap-elasticsearch:8.11.4
- quay.io/astronomer/ap-fluentd:1.16.3
- quay.io/astronomer/ap-grafana:10.2.3
- quay.io/astronomer/ap-houston-api:0.34.4
- quay.io/astronomer/ap-init:3.18.5
- quay.io/astronomer/ap-init:3.18.6
- quay.io/astronomer/ap-kibana:8.11.4
- quay.io/astronomer/ap-kube-state:2.10.1
- quay.io/astronomer/ap-nats-exporter:0.14.0
- quay.io/astronomer/ap-nats-server:2.10.9-1
- quay.io/astronomer/ap-nats-streaming:0.25.6
- quay.io/astronomer/ap-nginx-es:1.25.3
- quay.io/astronomer/ap-nats-exporter:0.14.0-1
- quay.io/astronomer/ap-nats-server:2.10.9-2
- quay.io/astronomer/ap-nats-streaming:0.25.6-1
- quay.io/astronomer/ap-nginx-es:1.25.3-1
- quay.io/astronomer/ap-nginx:1.9.5
- quay.io/astronomer/ap-node-exporter:1.7.0
- quay.io/astronomer/ap-openresty:1.25.3
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-9
- quay.io/astronomer/ap-postgres-exporter:0.15.0-3
- quay.io/astronomer/ap-postgresql:15.5.0
- quay.io/astronomer/ap-openresty:1.25.3-1
- quay.io/astronomer/ap-pgbouncer-krb:1.17.0-10
- quay.io/astronomer/ap-postgres-exporter:0.15.0-4
- quay.io/astronomer/ap-postgresql:15.5.0-1
- quay.io/astronomer/ap-prometheus:2.45.3
- quay.io/astronomer/ap-registry:3.18.5-1
- quay.io/astronomer/ap-vector:0.32.2-3
- quay.io/astronomer/ap-registry:3.18.6
- quay.io/astronomer/ap-vector:0.32.2-4
context:
- twistcli

Expand Down
6 changes: 3 additions & 3 deletions charts/astronomer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ images:
pullPolicy: IfNotPresent
registry:
repository: quay.io/astronomer/ap-registry
tag: 3.18.5-1
tag: 3.18.6
pullPolicy: IfNotPresent
# httpSecret: ~
houston:
Expand All @@ -32,11 +32,11 @@ images:
pullPolicy: IfNotPresent
dbBootstrapper:
repository: quay.io/astronomer/ap-db-bootstrapper
tag: 0.31.10
tag: 0.31.11
pullPolicy: IfNotPresent
cliInstall:
repository: quay.io/astronomer/ap-cli-install
tag: 0.26.21
tag: 0.26.22
pullPolicy: IfNotPresent

securityContext:
Expand Down
6 changes: 3 additions & 3 deletions charts/elasticsearch/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ images:
pullPolicy: IfNotPresent
init:
repository: quay.io/astronomer/ap-base # needs root permissions for sysctl changes
tag: 3.18.5
tag: 3.18.6
pullPolicy: IfNotPresent
curator:
repository: quay.io/astronomer/ap-curator
tag: 8.0.8-6
tag: 8.0.8-7
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-elasticsearch-exporter
tag: 1.7.0
pullPolicy: IfNotPresent
nginx:
repository: quay.io/astronomer/ap-nginx-es
tag: 1.25.3
tag: 1.25.3-1
pullPolicy: IfNotPresent

common:
Expand Down
4 changes: 2 additions & 2 deletions charts/external-es-proxy/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ replicaCount: 1
images:
esproxy:
repository: quay.io/astronomer/ap-openresty
tag: 1.25.3
tag: 1.25.3-1
pullPolicy: IfNotPresent
awsproxy:
repository: quay.io/astronomer/ap-awsesproxy
tag: 1.5.0-6
tag: 1.5.0-7
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/grafana/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ images:
pullPolicy: IfNotPresent
dbBootstrapper:
repository: quay.io/astronomer/ap-db-bootstrapper
tag: 0.31.10
tag: 0.31.11
pullPolicy: IfNotPresent

securityContext:
Expand Down
2 changes: 1 addition & 1 deletion charts/kibana/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ images:
pullPolicy: IfNotPresent
init:
repository: quay.io/astronomer/ap-init
tag: 3.18.5
tag: 3.18.6
pullPolicy: IfNotPresent

securityContext:
Expand Down
6 changes: 3 additions & 3 deletions charts/nats/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
images:
nats:
repository: quay.io/astronomer/ap-nats-server
tag: 2.10.9-1
tag: 2.10.9-2
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-nats-exporter
tag: 0.14.0
tag: 0.14.0-1
pullPolicy: IfNotPresent
dbBootstrapper:
repository: quay.io/astronomer/ap-db-bootstrapper
tag: 0.31.10
tag: 0.31.11
pullPolicy: IfNotPresent


Expand Down
2 changes: 1 addition & 1 deletion charts/nginx/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ images:
pullPolicy: IfNotPresent
defaultBackend:
repository: quay.io/astronomer/ap-default-backend
tag: 0.28.22
tag: 0.28.23
pullPolicy: IfNotPresent

securityContext:
Expand Down
2 changes: 1 addition & 1 deletion charts/pgbouncer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#############################
image:
repository: quay.io/astronomer/ap-pgbouncer-krb
tag: 1.17.0-9
tag: 1.17.0-10
pullPolicy: IfNotPresent

securityContext:
Expand Down
2 changes: 1 addition & 1 deletion charts/postgresql/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ global:
image:
registry: quay.io
repository: astronomer/ap-postgresql
tag: 15.5.0
tag: 15.5.0-1
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-blackbox-exporter/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ strategy:

image:
repository: quay.io/astronomer/ap-blackbox-exporter
tag: 0.24.0-5
tag: 0.24.0-6
pullPolicy: IfNotPresent

## Optionally specify an array of imagePullSecrets.
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-postgres-exporter/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replicaCount: 2

image:
repository: quay.io/astronomer/ap-postgres-exporter
tag: 0.15.0-3
tag: 0.15.0-4
pullPolicy: IfNotPresent


Expand Down
4 changes: 4 additions & 0 deletions charts/prometheus/templates/prometheus-config-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,3 +723,7 @@ data:
regex: ([^:]+)(?::\d+)?;(\d+)
replacement: $1:$2
target_label: __address__
{{- with .Values.additionalScrapeJobs }}
{{- toYaml . | nindent 6 }}
{{- end }}
17 changes: 17 additions & 0 deletions charts/prometheus/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,23 @@ additionalAlerts:
# annotations:
# summary: "The Astronomer Helm release {{ .Release.Name }} is failing task instances {{ printf \"%.2f\" $value }}% of the time over the past 30 minutes"
# description: Task instances failing above threshold
additionalScrapeJobs: {}
# Example:
# additionalScrapeJobs:
# - job_name: 'my-job'
# kubernetes_sd_configs:
# - role: endpoints
# relabel_configs:
# - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
# action: keep
# regex: true
# - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
# action: replace
# target_label: __scheme__
# regex: (https?)
# - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
# action: replace
#

# Prometheus config file remote_write stanza
# https://prometheus.io/docs/prometheus/latest/configuration/configuration/
Expand Down
6 changes: 3 additions & 3 deletions charts/stan/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
images:
init:
repository: quay.io/astronomer/ap-init
tag: 3.18.5
tag: 3.18.6
pullPolicy: IfNotPresent
stan:
repository: quay.io/astronomer/ap-nats-streaming
tag: 0.25.6
tag: 0.25.6-1
pullPolicy: IfNotPresent
exporter:
repository: quay.io/astronomer/ap-nats-exporter
tag: 0.14.0
tag: 0.14.0-1
pullPolicy: IfNotPresent


Expand Down
36 changes: 36 additions & 0 deletions tests/chart_tests/test_prometheus_config_configmap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,39 @@ def assert_relabel_config_for_non_auto_generated_namesaces(self, chart):
]
assert metric_relabel_config_search_result[1]["replacement"] == "$1"
assert metric_relabel_config_search_result[1]["target_label"] == "release"

def test_additional_scrape_jobs(self, kube_version):
static_job = {
"job_name": "example-static-job",
"static_configs": [{"targets": ["localhost:9090"]}],
}
kubernetes_job = {
"job_name": "example-kubernetes-job",
"kubernetes_sd_configs": [
{
"role": "endpoints",
"namespaces": {"names": ["default"]},
}
],
}
doc = render_chart(
kube_version=kube_version,
show_only=self.show_only,
name="astronomer",
values={
"prometheus": {
"additionalScrapeJobs": [
static_job,
kubernetes_job,
]
}
},
)[0]
scrape_configs = yaml.safe_load(doc["data"]["config"])["scrape_configs"]

assert (
static_job in scrape_configs
), "Static job not found in rendered ConfigMap"
assert (
kubernetes_job in scrape_configs
), "Kubernetes job not found in rendered ConfigMap"
6 changes: 3 additions & 3 deletions values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ global:
containerdnodeAffinitys: []
certCopier:
repository: quay.io/astronomer/ap-base
tag: 3.18.5
tag: 3.18.6
pullPolicy: IfNotPresent
# Global flag to enable to user to enable/disable Astronomer platform
# level Network Policy
Expand Down Expand Up @@ -136,7 +136,7 @@ global:
loggingSidecar:
enabled: false
name: sidecar-log-consumer
image: quay.io/astronomer/ap-vector:0.32.2-3
image: quay.io/astronomer/ap-vector:0.32.2-4
customConfig: false
indexPattern: ~
extraEnv: []
Expand All @@ -152,7 +152,7 @@ global:
authSidecar:
enabled: false
repository: quay.io/astronomer/ap-auth-sidecar
tag: 1.25.2-3
tag: 1.25.3-1
pullPolicy: IfNotPresent
port: 8084
default_nginx_settings: |
Expand Down

0 comments on commit 187b8ff

Please sign in to comment.