diff --git a/docker-compose.metrics.yml b/docker-compose.metrics.yml index 7438690bf..7a3c50d5f 100644 --- a/docker-compose.metrics.yml +++ b/docker-compose.metrics.yml @@ -70,6 +70,7 @@ services: volumes: - ${PWD}:/srv/newsblur elasticsearch_exporter: + container_name: elasticsearch_exporter image: prometheuscommunity/elasticsearch-exporter:latest command: - '--es.uri=http://db_elasticsearch:9200' @@ -78,3 +79,10 @@ services: - "9210:9114" depends_on: - db_elasticsearch + postgres_exporter: + container_name: postgres-exporter + image: prometheuscommunity/postgres-exporter + environment: + DATA_SOURCE_NAME: 'postgresql://newsblur:newsblur@db_postgres:5432/postgres?sslmode=disable' + ports: + - '9187:9187' \ No newline at end of file diff --git a/docker/prometheus/prometheus.consul.yml.j2 b/docker/prometheus/prometheus.consul.yml.j2 index e7fe2b612..7c978830f 100644 --- a/docker/prometheus/prometheus.consul.yml.j2 +++ b/docker/prometheus/prometheus.consul.yml.j2 @@ -227,5 +227,13 @@ scrape_configs: - server: 'consul.service.nyc1.consul:8500' services: ['elasticsearch_exporter'] relabel_configs: + - source_labels: ['__meta_consul_node'] + target_label: instance + + - job_name: 'postgres exporter' + consul_sd_configs: + - server: 'consul.service.nyc1.consul:8500' + services: ['postgres_exporter'] + relabel_configs: - source_labels: ['__meta_consul_node'] target_label: instance \ No newline at end of file diff --git a/docker/prometheus/prometheus.docker.yml b/docker/prometheus/prometheus.docker.yml index 9b2fc7407..e687feea4 100644 --- a/docker/prometheus/prometheus.docker.yml +++ b/docker/prometheus/prometheus.docker.yml @@ -220,5 +220,12 @@ scrape_configs: static_configs: - targets: ['elasticsearch_exporter:9114'] scheme: http + tls_config: + insecure_skip_verify: true + + - job_name: 'postgres exporter' + static_configs: + - targets: ['postgres_exporter:9187'] + scheme: http tls_config: insecure_skip_verify: true \ No newline at end of file