From 95910f5c1785c270b2f9ea243aabd329609d046e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 01:27:05 +0800 Subject: [PATCH 01/18] prome --- config/config.yaml | 1 + docker-compose.yaml | 43 ++++++++++++++++------ docker-compose_cfg/datasource-compose.yaml | 13 +++++++ docker-compose_cfg/prometheus-compose.yml | 13 +++++++ 4 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 docker-compose_cfg/datasource-compose.yaml create mode 100644 docker-compose_cfg/prometheus-compose.yml diff --git a/config/config.yaml b/config/config.yaml index 55a96f0b8..e51f3e3f9 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -757,3 +757,4 @@ demo: rtc: signalTimeout: 35 + diff --git a/docker-compose.yaml b/docker-compose.yaml index 115c49f9e..4f0c5bd65 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -112,18 +112,7 @@ services: MINIO_ROOT_PASSWORD: key12345 restart: always command: minio server /data --console-address ':9090' - # - # dtm: - # image: yedf/dtm - # ports: - # - 36789:36789 - # - 36790:36790 - # environment: - # STORE_DRIVER: mysql - # STORE_HOST: localhost - # STORE_USER: root - # STORE_PASSWORD: '' - # STORE_PORT: 3306 + open_im_server: image: openim/open_im_server:v2.3.1 @@ -147,3 +136,33 @@ services: options: max-size: "1g" max-file: "2" + + prometheus: + image: prom/prometheus + volumes: + - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml + container_name: prometheus + networks: + webnet: + aliases: + - "prometheus" + ports: + - "10007:9090" + depends_on: + - open_im_server + + grafana: + image: grafana/grafana + volumes: + - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json + - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml + - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml + container_name: grafana + networks: + webnet: + aliases: + - "grafana" + ports: + - "10008:3000" + depends_on: + - prometheus \ No newline at end of file diff --git a/docker-compose_cfg/datasource-compose.yaml b/docker-compose_cfg/datasource-compose.yaml new file mode 100644 index 000000000..3738b74d8 --- /dev/null +++ b/docker-compose_cfg/datasource-compose.yaml @@ -0,0 +1,13 @@ +#more datasource-compose.yaml +apiVersion: 1 + +datasources: +- name: Prometheus + type: prometheus + access: proxy + orgId: 1 + url: http://127.0.0.1:10007 + basicAuth: false + isDefault: true + version: 1 + editable: true \ No newline at end of file diff --git a/docker-compose_cfg/prometheus-compose.yml b/docker-compose_cfg/prometheus-compose.yml new file mode 100644 index 000000000..d61add2fb --- /dev/null +++ b/docker-compose_cfg/prometheus-compose.yml @@ -0,0 +1,13 @@ +#more prometheus-compose.yml +global: + scrape_interval: 15s + evaluation_interval: 15s + +scrape_configs: + - job_name: 'prometheus' + static_configs: + - targets: ['localhost:10007'] + - job_name: 'openIM-server' + static_configs: + - targets: ['localhost:10006/cms/prometheus/'] + \ No newline at end of file From b1f1ec5fbb7d36d9567ecdf39b0628cb502ef429 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 01:31:00 +0800 Subject: [PATCH 02/18] prome --- docker-compose.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4f0c5bd65..576456d37 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -142,10 +142,6 @@ services: volumes: - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml container_name: prometheus - networks: - webnet: - aliases: - - "prometheus" ports: - "10007:9090" depends_on: @@ -158,10 +154,6 @@ services: - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml container_name: grafana - networks: - webnet: - aliases: - - "grafana" ports: - "10008:3000" depends_on: From c80b4c1d32f24998c797256ac816eacf0539e079 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 01:46:30 +0800 Subject: [PATCH 03/18] prome --- docker-compose.yaml | 12 +++++++----- docker-compose_cfg/prometheus-compose.yml | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 576456d37..1fc8279aa 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -140,21 +140,23 @@ services: prometheus: image: prom/prometheus volumes: - - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml + - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml + - ./components/prometheus_data:/prometheus container_name: prometheus ports: - - "10007:9090" + - 10007:9090 depends_on: - open_im_server grafana: image: grafana/grafana volumes: - - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json - - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml + # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json + # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml + - ./components/grafana_data:/var/lib/grafana container_name: grafana ports: - - "10008:3000" + - 10008:3000 depends_on: - prometheus \ No newline at end of file diff --git a/docker-compose_cfg/prometheus-compose.yml b/docker-compose_cfg/prometheus-compose.yml index d61add2fb..c8bd84763 100644 --- a/docker-compose_cfg/prometheus-compose.yml +++ b/docker-compose_cfg/prometheus-compose.yml @@ -8,6 +8,7 @@ scrape_configs: static_configs: - targets: ['localhost:10007'] - job_name: 'openIM-server' + metrics_path: /cms/prometheus/metrics static_configs: - - targets: ['localhost:10006/cms/prometheus/'] + - targets: ['localhost:10006'] \ No newline at end of file From 783a4d33b4a0a7739bae340aa302989dcd6df655 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 01:54:19 +0800 Subject: [PATCH 04/18] prome --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1fc8279aa..5ee18a5d6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -141,7 +141,7 @@ services: image: prom/prometheus volumes: - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml - - ./components/prometheus_data:/prometheus + # - ./components/prometheus_data:/prometheus container_name: prometheus ports: - 10007:9090 @@ -154,7 +154,7 @@ services: # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml - - ./components/grafana_data:/var/lib/grafana + # - ./components/grafana_data:/var/lib/grafana container_name: grafana ports: - 10008:3000 From db38a64a3081c61481fb6e54961dfc22509652e4 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 02:08:14 +0800 Subject: [PATCH 05/18] prome --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ee18a5d6..73cbf32f6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -157,6 +157,6 @@ services: # - ./components/grafana_data:/var/lib/grafana container_name: grafana ports: - - 10008:3000 + - 40003:3000 depends_on: - prometheus \ No newline at end of file From 947609a3b3f5e4c6fb14507bbe9cf916d6f5074d Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 02:08:41 +0800 Subject: [PATCH 06/18] prome --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 73cbf32f6..5ee18a5d6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -157,6 +157,6 @@ services: # - ./components/grafana_data:/var/lib/grafana container_name: grafana ports: - - 40003:3000 + - 10008:3000 depends_on: - prometheus \ No newline at end of file From 602ac1ffb868b9ae758086b022a5a8c300549dff Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 02:15:21 +0800 Subject: [PATCH 07/18] prome --- internal/cms_api/router.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cms_api/router.go b/internal/cms_api/router.go index c5ff5aab2..de4ebbd75 100644 --- a/internal/cms_api/router.go +++ b/internal/cms_api/router.go @@ -18,6 +18,10 @@ func NewGinRouter() *gin.Engine { baseRouter := gin.Default() router := baseRouter.Group("/cms") router.Use(middleware.CorsHandler()) + prometheusRouterGroup := router.Group("/prometheus") + { + prometheusRouterGroup.GET("/metrics", prometheusHandler()) + } adminRouterGroup := router.Group("/admin") { adminRouterGroup.POST("/login", admin.AdminLogin) @@ -69,9 +73,5 @@ func NewGinRouter() *gin.Engine { friendCMSRouterGroup.POST("/get_friends", friend.GetUserFriends) } - prometheusRouterGroup := r2.Group("/prometheus") - { - prometheusRouterGroup.GET("/metrics", prometheusHandler()) - } return baseRouter } From 26c65d0da8cbdc872c39c962fecd3e0b6c938c72 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 02:19:23 +0800 Subject: [PATCH 08/18] prome --- docker-compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ee18a5d6..ebfe62e9f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -147,6 +147,7 @@ services: - 10007:9090 depends_on: - open_im_server + network_mode: "host" grafana: image: grafana/grafana @@ -159,4 +160,5 @@ services: ports: - 10008:3000 depends_on: - - prometheus \ No newline at end of file + - prometheus + network_mode: "host" \ No newline at end of file From 9cc08251851b243b8fd1898e4261bd0d28bc748a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 8 Sep 2022 02:32:59 +0800 Subject: [PATCH 09/18] prome --- docker-compose.yaml | 4 +- docker-compose_cfg/grafana.ini | 1285 ++++++++++++++++++++++++++++++++ 2 files changed, 1287 insertions(+), 2 deletions(-) create mode 100644 docker-compose_cfg/grafana.ini diff --git a/docker-compose.yaml b/docker-compose.yaml index ebfe62e9f..506f77c34 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -147,7 +147,6 @@ services: - 10007:9090 depends_on: - open_im_server - network_mode: "host" grafana: image: grafana/grafana @@ -155,10 +154,11 @@ services: # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml + - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini # - ./components/grafana_data:/var/lib/grafana container_name: grafana ports: - - 10008:3000 + - 10008:10008 depends_on: - prometheus network_mode: "host" \ No newline at end of file diff --git a/docker-compose_cfg/grafana.ini b/docker-compose_cfg/grafana.ini new file mode 100644 index 000000000..fd4892050 --- /dev/null +++ b/docker-compose_cfg/grafana.ini @@ -0,0 +1,1285 @@ +##################### Grafana Configuration Defaults ##################### +# +# Do not modify this file in grafana installs +# + +# possible values : production, development +app_mode = production + +# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty +instance_name = ${HOSTNAME} + +# force migration will run migrations that might cause dataloss +force_migration = false + +#################################### Paths ############################### +[paths] +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) +data = data + +# Temporary files in `data` directory older than given duration will be removed +temp_data_lifetime = 24h + +# Directory where grafana can store logs +logs = data/log + +# Directory where grafana will automatically scan and look for plugins +plugins = data/plugins + +# folder that contains provisioning config files that grafana will apply on startup and while running. +provisioning = conf/provisioning + +#################################### Server ############################## +[server] +# Protocol (http, https, h2, socket) +protocol = http + +# The ip address to bind to, empty will bind to all interfaces +http_addr = + +# The http port to use +http_port = 10008 + +# The public facing domain name used to access grafana from a browser +domain = localhost + +# Redirect to correct domain if host header does not match domain +# Prevents DNS rebinding attacks +enforce_domain = false + +# The full public facing url +root_url = %(protocol)s://%(domain)s:%(http_port)s/ + +# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. +serve_from_sub_path = false + +# Log web requests +router_logging = false + +# the path relative working path +static_root_path = public + +# enable gzip +enable_gzip = false + +# https certs & key file +cert_file = +cert_key = + +# Unix socket path +socket = /tmp/grafana.sock + +# CDN Url +cdn_url = + +# Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections. +# `0` means there is no timeout for reading the request. +read_timeout = 0 + +#################################### Database ############################ +[database] +# You can configure the database connection by specifying type, host, name, user and password +# as separate properties or as on string using the url property. + +# Either "mysql", "postgres" or "sqlite3", it's your choice +type = sqlite3 +host = 127.0.0.1:3306 +name = grafana +user = root +# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" +password = +# Use either URL or the previous fields to configure the database +# Example: mysql://user:secret@host:port/database +url = + +# Max idle conn setting default is 2 +max_idle_conn = 2 + +# Max conn setting default is 0 (mean not set) +max_open_conn = + +# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) +conn_max_lifetime = 14400 + +# Set to true to log the sql calls and execution times. +log_queries = + +# For "postgres", use either "disable", "require" or "verify-full" +# For "mysql", use either "true", "false", or "skip-verify". +ssl_mode = disable + +# Database drivers may support different transaction isolation levels. +# Currently, only "mysql" driver supports isolation levels. +# If the value is empty - driver's default isolation level is applied. +# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE". +isolation_level = + +ca_cert_path = +client_key_path = +client_cert_path = +server_cert_name = + +# For "sqlite3" only, path relative to data_path setting +path = grafana.db + +# For "sqlite3" only. cache mode setting used for connecting to the database +cache_mode = private + +# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0. +locking_attempt_timeout_sec = 0 + +#################################### Cache server ############################# +[remote_cache] +# Either "redis", "memcached" or "database" default is "database" +type = database + +# cache connectionstring options +# database: will use Grafana primary database. +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'. +# memcache: 127.0.0.1:11211 +connstr = + +#################################### Data proxy ########################### +[dataproxy] + +# This enables data proxy logging, default is false +logging = false + +# How long the data proxy waits to read the headers of the response before timing out, default is 30 seconds. +# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set. +timeout = 30 + +# How long the data proxy waits to establish a TCP connection before timing out, default is 10 seconds. +dialTimeout = 10 + +# How many seconds the data proxy waits before sending a keepalive request. +keep_alive_seconds = 30 + +# How many seconds the data proxy waits for a successful TLS Handshake before timing out. +tls_handshake_timeout_seconds = 10 + +# How many seconds the data proxy will wait for a server's first response headers after +# fully writing the request headers if the request has an "Expect: 100-continue" +# header. A value of 0 will result in the body being sent immediately, without +# waiting for the server to approve. +expect_continue_timeout_seconds = 1 + +# Optionally limits the total number of connections per host, including connections in the dialing, +# active, and idle states. On limit violation, dials will block. +# A value of zero (0) means no limit. +max_conns_per_host = 0 + +# The maximum number of idle connections that Grafana will keep alive. +max_idle_connections = 100 + +# How many seconds the data proxy keeps an idle connection open before timing out. +idle_conn_timeout_seconds = 90 + +# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request. +send_user_header = false + +# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests. +response_limit = 0 + +# Limits the number of rows that Grafana will process from SQL data sources. +row_limit = 1000000 + +#################################### Analytics ########################### +[analytics] +# Server reporting, sends usage counters to stats.grafana.org every 24 hours. +# No ip addresses are being tracked, only simple counters to track +# running instances, dashboard and error counts. It is very helpful to us. +# Change this option to false to disable reporting. +reporting_enabled = true + +# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs +reporting_distributor = grafana-labs + +# Set to false to disable all checks to https://grafana.com +# for new versions of grafana. The check is used +# in some UI views to notify that a grafana update exists. +# This option does not cause any auto updates, nor send any information +# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version. +check_for_updates = true + +# Set to false to disable all checks to https://grafana.com +# for new versions of plugins. The check is used +# in some UI views to notify that a plugin update exists. +# This option does not cause any auto updates, nor send any information +# only a GET request to https://grafana.com to get the latest versions. +check_for_plugin_updates = true + +# Google Analytics universal tracking code, only enabled if you specify an id here +google_analytics_ua_id = + +# Google Tag Manager ID, only enabled if you specify an id here +google_tag_manager_id = + +# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set +rudderstack_write_key = + +# Rudderstack data plane url, enabled only if rudderstack_write_key is also set +rudderstack_data_plane_url = + +# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set +rudderstack_sdk_url = + +# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config +rudderstack_config_url = + +# Application Insights connection string. Specify an URL string to enable this feature. +application_insights_connection_string = + +# Optional. Specifies an Application Insights endpoint URL where the endpoint string is wrapped in backticks ``. +application_insights_endpoint_url = + +# Controls if the UI contains any links to user feedback forms +feedback_links_enabled = true + +#################################### Security ############################ +[security] +# disable creation of admin user on first start of grafana +disable_initial_admin_creation = false + +# default admin user, created on startup +admin_user = admin + +# default admin password, can be changed before first start of grafana, or in profile settings +admin_password = admin + +# default admin email, created on startup +admin_email = admin@localhost + +# used for signing +secret_key = SW2YcwTIb9zpOOhoPsMm + +# current key provider used for envelope encryption, default to static value specified by secret_key +encryption_provider = secretKey.v1 + +# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1 +available_encryption_providers = + +# disable gravatar profile images +disable_gravatar = false + +# data source proxy whitelist (ip_or_domain:port separated by spaces) +data_source_proxy_whitelist = + +# disable protection against brute force login attempts +disable_brute_force_login_protection = false + +# set to true if you host Grafana behind HTTPS. default is false. +cookie_secure = false + +# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled" +cookie_samesite = lax + +# set to true if you want to allow browsers to render Grafana in a ,