diff --git a/.gitignore b/.gitignore index 7ccff850c65b2edddced2ba9dd48eeb10d87b8d9..0621410a592efcee9a9bc7e4a84058aab67bd735 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ __pycache__ .env volumes/ +volumes_dev/ certs/*.pem diff --git a/grafana/grafana.ini b/grafana/grafana.ini index bda4336a64ac40a7a3667c234e01d050e880ca1f..be2dd7c9e5ca82366af736d485795b86e2054613 100644 --- a/grafana/grafana.ini +++ b/grafana/grafana.ini @@ -148,10 +148,10 @@ log_queries = #################################### Security #################################### [security] # default admin user, created on startup -admin_user = unicorn +#admin_user = unicorn # default admin password, can be changed before first start of grafana, or in profile settings -admin_password = UnicornsExists! +#admin_password = UnicornsExists! # used for signing ;secret_key = SW2YcwTIb9zpOOhoPsMm diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 5e51280435c6a93d39122b89592bbae1a5ddfc75..f61ddff390aefda56ef867b17b57481d26493df4 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -29,33 +29,8 @@ scrape_configs: - targets: ['127.0.0.1:9100', '192.168.1.77:9100'] scrape_interval: 5s - - job_name: 'runner local' - metrics_path: /metrics - static_configs: - - targets: ['127.0.0.1:9252', 'vidjil-lego.ci:9252'] - scrape_interval: 5s - - job_name: 'vidjil' static_configs: - targets: ['127.0.0.1:5000'] - scrape_interval: 30s - - ### configuration de blackbox, notre probe http - - - job_name: 'blackbox' - metrics_path: /probe - params: - module: [http_2xx] # Look for a HTTP 200 response. - relabel_configs: - - source_labels: [__address__] - regex: ([^,]*),(.*) # <-- ici on fait une regex pour tagger nos urls avec une virgule - replacement: $1 - target_label: __param_target - - source_labels: [__address__] - target_label: instance - - target_label: __address__ - replacement: localhost:9115 # The blackbox exporter's real hostname:port. + scrape_interval: 90s - static_configs: - - targets: - - http://localhost:9090,prometheus \ No newline at end of file