From 7087092ffd36742230e36ed1c932628295280340 Mon Sep 17 00:00:00 2001 From: BryantHe Date: Sun, 2 Jul 2023 04:29:36 +0800 Subject: [PATCH] =?UTF-8?q?chore(hyl):=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + {apisix_conf => apisix/apisix_conf}/config.yaml | 0 .../dashboard_conf}/conf.yaml | 0 {etcd_conf => apisix/etcd_conf}/etcd.conf.yml | 0 .../grafana_conf}/config/grafana.ini | 0 .../dashboards/apisix-grafana-dashboard.json | 0 .../grafana_conf}/provisioning/dashboards/all.yaml | 0 .../provisioning/datasources/all.yaml | 0 {mkcert => apisix/mkcert}/README.md | 0 {mkcert => apisix/mkcert}/lvh.me+1-key.pem | 0 {mkcert => apisix/mkcert}/lvh.me+1.pem | 0 {mkcert => apisix/mkcert}/rootCA-key.pem | 0 {mkcert => apisix/mkcert}/rootCA.pem | 0 .../prometheus_conf}/prometheus.yml | 0 docker-compose-apisix.yml | 12 ++++++------ .../admin_service/grafana/Admin Service.json | 14 +++++++------- 16 files changed, 14 insertions(+), 13 deletions(-) rename {apisix_conf => apisix/apisix_conf}/config.yaml (100%) rename {dashboard_conf => apisix/dashboard_conf}/conf.yaml (100%) rename {etcd_conf => apisix/etcd_conf}/etcd.conf.yml (100%) rename {grafana_conf => apisix/grafana_conf}/config/grafana.ini (100%) rename {grafana_conf => apisix/grafana_conf}/dashboards/apisix-grafana-dashboard.json (100%) rename {grafana_conf => apisix/grafana_conf}/provisioning/dashboards/all.yaml (100%) rename {grafana_conf => apisix/grafana_conf}/provisioning/datasources/all.yaml (100%) rename {mkcert => apisix/mkcert}/README.md (100%) rename {mkcert => apisix/mkcert}/lvh.me+1-key.pem (100%) rename {mkcert => apisix/mkcert}/lvh.me+1.pem (100%) rename {mkcert => apisix/mkcert}/rootCA-key.pem (100%) rename {mkcert => apisix/mkcert}/rootCA.pem (100%) rename {prometheus_conf => apisix/prometheus_conf}/prometheus.yml (100%) diff --git a/README.md b/README.md index 3154311..a9e92b7 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ grafana 的配置在：./service_configs/admin_service/grafana/xxxx.json （根 - Metrics - Prometheus + - rabbitmq_exporter - Grafana - Error Reporting - Sentry diff --git a/apisix_conf/config.yaml b/apisix/apisix_conf/config.yaml similarity index 100% rename from apisix_conf/config.yaml rename to apisix/apisix_conf/config.yaml diff --git a/dashboard_conf/conf.yaml b/apisix/dashboard_conf/conf.yaml similarity index 100% rename from dashboard_conf/conf.yaml rename to apisix/dashboard_conf/conf.yaml diff --git a/etcd_conf/etcd.conf.yml b/apisix/etcd_conf/etcd.conf.yml similarity index 100% rename from etcd_conf/etcd.conf.yml rename to apisix/etcd_conf/etcd.conf.yml diff --git a/grafana_conf/config/grafana.ini b/apisix/grafana_conf/config/grafana.ini similarity index 100% rename from grafana_conf/config/grafana.ini rename to apisix/grafana_conf/config/grafana.ini diff --git a/grafana_conf/dashboards/apisix-grafana-dashboard.json b/apisix/grafana_conf/dashboards/apisix-grafana-dashboard.json similarity index 100% rename from grafana_conf/dashboards/apisix-grafana-dashboard.json rename to apisix/grafana_conf/dashboards/apisix-grafana-dashboard.json diff --git a/grafana_conf/provisioning/dashboards/all.yaml b/apisix/grafana_conf/provisioning/dashboards/all.yaml similarity index 100% rename from grafana_conf/provisioning/dashboards/all.yaml rename to apisix/grafana_conf/provisioning/dashboards/all.yaml diff --git a/grafana_conf/provisioning/datasources/all.yaml b/apisix/grafana_conf/provisioning/datasources/all.yaml similarity index 100% rename from grafana_conf/provisioning/datasources/all.yaml rename to apisix/grafana_conf/provisioning/datasources/all.yaml diff --git a/mkcert/README.md b/apisix/mkcert/README.md similarity index 100% rename from mkcert/README.md rename to apisix/mkcert/README.md diff --git a/mkcert/lvh.me+1-key.pem b/apisix/mkcert/lvh.me+1-key.pem similarity index 100% rename from mkcert/lvh.me+1-key.pem rename to apisix/mkcert/lvh.me+1-key.pem diff --git a/mkcert/lvh.me+1.pem b/apisix/mkcert/lvh.me+1.pem similarity index 100% rename from mkcert/lvh.me+1.pem rename to apisix/mkcert/lvh.me+1.pem diff --git a/mkcert/rootCA-key.pem b/apisix/mkcert/rootCA-key.pem similarity index 100% rename from mkcert/rootCA-key.pem rename to apisix/mkcert/rootCA-key.pem diff --git a/mkcert/rootCA.pem b/apisix/mkcert/rootCA.pem similarity index 100% rename from mkcert/rootCA.pem rename to apisix/mkcert/rootCA.pem diff --git a/prometheus_conf/prometheus.yml b/apisix/prometheus_conf/prometheus.yml similarity index 100% rename from prometheus_conf/prometheus.yml rename to apisix/prometheus_conf/prometheus.yml diff --git a/docker-compose-apisix.yml b/docker-compose-apisix.yml index d6e13f6..e36f982 100644 --- a/docker-compose-apisix.yml +++ b/docker-compose-apisix.yml @@ -24,7 +24,7 @@ services: hostname: 'apisix-dashboard' restart: always volumes: - - ./dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml + - ./apisix/dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml ports: - "9000:9000" networks: @@ -36,7 +36,7 @@ services: hostname: 'apisix' restart: always volumes: - - ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro + - ./apisix/apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro depends_on: - etcd ##network_mode: host @@ -72,7 +72,7 @@ services: hostname: 'apisix-prometheus' restart: always volumes: - - ./prometheus_conf/prometheus.yml:/etc/prometheus/prometheus.yml + - ./apisix/prometheus_conf/prometheus.yml:/etc/prometheus/prometheus.yml ports: - "9093:9090" networks: @@ -86,9 +86,9 @@ services: ports: - "3010:3000" volumes: - - "./grafana_conf/provisioning:/etc/grafana/provisioning" - - "./grafana_conf/dashboards:/var/lib/grafana/dashboards" - - "./grafana_conf/config/grafana.ini:/etc/grafana/grafana.ini" + - "./apisix/grafana_conf/provisioning:/etc/grafana/provisioning" + - "./apisix/grafana_conf/dashboards:/var/lib/grafana/dashboards" + - "./apisix/grafana_conf/config/grafana.ini:/etc/grafana/grafana.ini" networks: apisix: diff --git a/service_configs/admin_service/grafana/Admin Service.json b/service_configs/admin_service/grafana/Admin Service.json index 56d7688..571d326 100644 --- a/service_configs/admin_service/grafana/Admin Service.json +++ b/service_configs/admin_service/grafana/Admin Service.json @@ -214,8 +214,8 @@ "gridPos": { "h": 12, "w": 12, - "x": 12, - "y": 0 + "x": 0, + "y": 12 }, "hiddenSeries": false, "id": 10, @@ -299,7 +299,7 @@ "h": 12, "w": 12, "x": 12, - "y": 0 + "y": 12 }, "hiddenSeries": false, "id": 10, @@ -382,8 +382,8 @@ "gridPos": { "h": 12, "w": 12, - "x": 12, - "y": 0 + "x": 0, + "y": 24 }, "hiddenSeries": false, "id": 10, @@ -461,7 +461,7 @@ "list": [] }, "time": { - "from": "now-1h", + "from": "now-12h", "to": "now" }, "timepicker": { @@ -492,6 +492,6 @@ "timezone": "", "title": "Admin Service", "uid": "ReKfE8Q4z", - "version": 2, + "version": 7, "weekStart": "" } \ No newline at end of file