Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2f2eea3

Browse files
committed
rename grafana pass variable
1 parentc41b781 commit2f2eea3

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

‎docker-compose.yml‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ services:
2626
POSTGRES_DB:target_database
2727
POSTGRES_USER:postgres
2828
POSTGRES_PASSWORD:postgres
29-
command:["postgres", "-c", "shared_preload_libraries=pg_stat_statements", "-c", "pg_stat_statements.track=all"]
29+
command:
30+
[
31+
"postgres",
32+
"-c",
33+
"shared_preload_libraries=pg_stat_statements",
34+
"-c",
35+
"pg_stat_statements.track=all",
36+
]
3037
ports:
3138
-"55432:5432"
3239
volumes:
@@ -57,18 +64,24 @@ services:
5764
-./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
5865
-prometheus_data:/prometheus
5966
command:
60-
-'--config.file=/etc/prometheus/prometheus.yml'
61-
-'--storage.tsdb.path=/prometheus'
62-
-'--web.console.libraries=/etc/prometheus/console_libraries'
63-
-'--web.console.templates=/etc/prometheus/consoles'
64-
-'--storage.tsdb.retention.time=200h'
65-
-'--web.enable-lifecycle'
67+
-"--config.file=/etc/prometheus/prometheus.yml"
68+
-"--storage.tsdb.path=/prometheus"
69+
-"--web.console.libraries=/etc/prometheus/console_libraries"
70+
-"--web.console.templates=/etc/prometheus/consoles"
71+
-"--storage.tsdb.retention.time=200h"
72+
-"--web.enable-lifecycle"
6673

6774
# PGWatch Instance 1 - Monitoring service (Postgres sink)
6875
pgwatch-postgres:
6976
image:cybertecpostgresql/pgwatch:3
7077
container_name:pgwatch-postgres
71-
command:["--sources=/etc/pgwatch/sources.yml", "--metrics=/etc/pgwatch/metrics.yml", "--sink=postgresql://pgwatch:pgwatchadmin@sink-postgres:5432/measurements", "--web-addr=:8080"]
78+
command:
79+
[
80+
"--sources=/etc/pgwatch/sources.yml",
81+
"--metrics=/etc/pgwatch/metrics.yml",
82+
"--sink=postgresql://pgwatch:pgwatchadmin@sink-postgres:5432/measurements",
83+
"--web-addr=:8080",
84+
]
7285
ports:
7386
-"58080:8080"
7487
depends_on:
@@ -82,7 +95,13 @@ services:
8295
pgwatch-prometheus:
8396
image:cybertecpostgresql/pgwatch:3
8497
container_name:pgwatch-prometheus
85-
command:["--sources=/etc/pgwatch/sources.yml", "--metrics=/etc/pgwatch/metrics.yml", "--sink=prometheus://0.0.0.0:9091/pgwatch", "--web-addr=:8089"]
98+
command:
99+
[
100+
"--sources=/etc/pgwatch/sources.yml",
101+
"--metrics=/etc/pgwatch/metrics.yml",
102+
"--sink=prometheus://0.0.0.0:9091/pgwatch",
103+
"--web-addr=:8089",
104+
]
86105
ports:
87106
-"58089:8089"
88107
-"59091:9091"
@@ -99,7 +118,7 @@ services:
99118
container_name:grafana-with-datasources
100119
environment:
101120
GF_SECURITY_ADMIN_USER:monitor
102-
GF_SECURITY_ADMIN_PASSWORD:${GRAFANA_PASSWORD:-demo}
121+
GF_SECURITY_ADMIN_PASSWORD:${GF_SECURITY_ADMIN_PASSWORD:-demo}
103122
GF_INSTALL_PLUGINS:yesoreyeram-infinity-datasource
104123
ports:
105124
-"3000:3000"

‎terraform/aws/user_data.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ EOF
9393

9494
# Create .env file for docker-compose
9595
cat> .env<<ENV_EOF
96-
GRAFANA_PASSWORD=${grafana_password}
96+
GF_SECURITY_ADMIN_PASSWORD=${grafana_password}
9797
ENV_EOF
9898

9999
# Ensure secure permissions

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp