Page MenuHomeDevCentral
Files F3765800

D2952.id7515.diff
No OneTemporary
Actions

D2952.id7515.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -105,6 +105,7 @@
- ops/secrets/nasqueron/airflow/admin_account
- ops/secrets/nasqueron/airflow/fernet
+ - ops/secrets/nasqueron/airflow/sentry
- ops/secrets/dbserver/cluster-A/users/airflow
- ops/secrets/nasqueron/rabbitmq/white-rabbit/erlang-cookie
@@ -174,6 +175,7 @@
- ops/secrets/nasqueron/airflow/admin_account
- ops/secrets/nasqueron/airflow/fernet
+ - ops/secrets/nasqueron/airflow/sentry
- ops/secrets/dbserver/cluster-A/users/airflow
#
diff --git a/pillar/paas/docker/dwellers/airflow.sls b/pillar/paas/docker/dwellers/airflow.sls
--- a/pillar/paas/docker/dwellers/airflow.sls
+++ b/pillar/paas/docker/dwellers/airflow.sls
@@ -7,7 +7,7 @@
# -------------------------------------------------------------
docker_images:
- - apache/airflow:2.5.2
+ - nasqueron/airflow
- redis
airflow_default_container_args: &airflow
@@ -57,6 +57,10 @@
admin_account: nasqueron/airflow/admin_account
fernet_key: nasqueron/airflow/fernet
postgresql: dbserver/cluster-A/users/airflow
+ sentry:
+ realm: nasqueron
+ project_id: 4
+ credential: nasqueron/airflow/sentry
# -------------------------------------------------------------
# Airflow specific monitorng
diff --git a/pillar/services/monitoring-reporting.sls b/pillar/services/monitoring-reporting.sls
new file mode 100644
--- /dev/null
+++ b/pillar/services/monitoring-reporting.sls
@@ -0,0 +1,16 @@
+# -------------------------------------------------------------
+# Salt — Monitoring and reporting services
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Notes: A more comprehensive definition could coexist
+# where the service need to be deployed.
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# Sentry
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+sentry_realms:
+ nasqueron:
+ hostname: sentry.nasqueron.org
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -15,6 +15,7 @@
- nodes.nodes
- nodes.forests
- hotfixes.roles
+ - services.monitoring-reporting
- webserver.sites
cloudhugger:
diff --git a/roles/paas-docker/containers/airflow.sls b/roles/paas-docker/containers/airflow.sls
--- a/roles/paas-docker/containers/airflow.sls
+++ b/roles/paas-docker/containers/airflow.sls
@@ -82,7 +82,7 @@
docker_container.running:
- detach: True
- interactive: True
- - image: apache/airflow:2.5.2
+ - image: nasqueron/airflow
- command: {{ container["command"] }}
- binds:
- /srv/airflow/{{ realm }}/dags:/opt/airflow/dags
@@ -101,7 +101,8 @@
- AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: postgresql+psycopg2://{{ postgresql_dsn }}/airflow
- - AIRFLOW__SCHEDULER__ENABLE_HEALTH_CHECK: "true"
+ - AIRFLOW__SENTRY__SENTRY_ON: "True"
+ - AIRFLOW__SENTRY__SENTRY_DSN: {{ salt["credentials.get_sentry_dsn"](realm_args["sentry"]) }}
{% if "app_port" in container %}
- ports:
- {{ container['command_port'] }}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 14:22 (18 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258212
Default Alt Text
D2952.id7515.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator