diff options
-rw-r--r-- | cluster/prod/app/drone-ci/deploy/server.hcl | 8 | ||||
-rw-r--r-- | cluster/prod/app/telemetry/config/prometheus.yml | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/cluster/prod/app/drone-ci/deploy/server.hcl b/cluster/prod/app/drone-ci/deploy/server.hcl index 85eb776..e3e9451 100644 --- a/cluster/prod/app/drone-ci/deploy/server.hcl +++ b/cluster/prod/app/drone-ci/deploy/server.hcl @@ -43,7 +43,7 @@ job "drone-ci" { task "drone_server" { driver = "docker" config { - image = "drone/drone:2.12.0" + image = "drone/drone:2.12.1" ports = [ "web_port" ] volumes = [ @@ -71,11 +71,9 @@ DRONE_S3_PATH_STYLE=true DRONE_DATABASE_DRIVER=sqlite3 DRONE_DATABASE_DATASOURCE=/ephemeral/drone.db DRONE_USER_CREATE=username:lx-admin,admin:true -__DRONE_REGISTRATION_CLOSED=true -DRONE_LOGS_TEXT=true -DRONE_LOGS_PRETTY=true +DRONE_REGISTRATION_CLOSED=true DRONE_LOGS_DEBUG=true -DOCKER_API_VERSION=1.39 +DRONE_LOGS_TRACE=true EOH destination = "secrets/env" env = true diff --git a/cluster/prod/app/telemetry/config/prometheus.yml b/cluster/prod/app/telemetry/config/prometheus.yml index d30ee13..42d438c 100644 --- a/cluster/prod/app/telemetry/config/prometheus.yml +++ b/cluster/prod/app/telemetry/config/prometheus.yml @@ -28,3 +28,16 @@ scrape_configs: ca_file: /etc/prometheus/consul.crt cert_file: /etc/prometheus/consul-client.crt key_file: /etc/prometheus/consul-client.key + + - job_name: 'drone' + authorization: + type: Bearer + credentials: {{ key "secrets/drone-ci/metrics_token" }} + consul_sd_configs: + - server: 'https://localhost:8501' + services: + - 'drone' + tls_config: + ca_file: /etc/prometheus/consul.crt + cert_file: /etc/prometheus/consul-client.crt + key_file: /etc/prometheus/consul-client.key |