Merge "Add panko and gnocchi as default backend"
diff --git a/docker/swarm/stack/monitoring/alertmanager.yml b/docker/swarm/stack/monitoring/alertmanager.yml
new file mode 100644
index 0000000..662baf4
--- /dev/null
+++ b/docker/swarm/stack/monitoring/alertmanager.yml
@@ -0,0 +1,37 @@
+classes:
+- system.prometheus.alertmanager.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ alertmanager:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "alertmanager"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "alertmanager"
+ image: ${_param:docker_image_alertmanager}
+ ports:
+ - 15011:${prometheus:alertmanager:bind:port}
+ volumes:
+ - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
+ - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
+ environment:
+ ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
+ ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
+ ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
+ ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
+ ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
+ ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 57d7a5a..134efdc 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -1,131 +1,8 @@
classes:
-- system.prometheus.alertmanager.container
-- system.prometheus.pushgateway.container
-- system.prometheus.remote_storage_adapter.container
-- system.prometheus.server.container
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.replicated
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
- system.docker.swarm.stack.monitoring.remote_agent
-parameters:
- _param:
- # Backward compatibility for Prometheus 1.7
- prometheus_storage_local_engine: "persisted"
- prometheus_storage_heap_size: 3221225472
- prometheus_storage_num_fingerprint_mutexes: 4096
-
- docker:
- client:
- stack:
- monitoring:
- network:
- monitoring:
- driver: overlay
- driver_opts:
- encrypted: 1
- service:
- relay:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "relay"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "relay"
- image: ${_param:docker_image_prometheus_relay}
- ports:
- - 15016:8080
- environment:
- PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
- remote_storage_adapter:
- networks:
- - monitoring
- deploy:
- replicas: 1
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- image: ${_param:docker_image_remote_storage_adapter}
- ports:
- - 15015:${prometheus:remote_storage_adapter:bind:port}
- environment:
- RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
- RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
- RSA_INFLUXDB_RETENTION_POLICY: 'lma'
- RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
- RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
- RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
- RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
- alertmanager:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "alertmanager"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "alertmanager"
- image: ${_param:docker_image_alertmanager}
- ports:
- - 15011:${prometheus:alertmanager:bind:port}
- volumes:
- - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
- - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
- environment:
- ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
- ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
- ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
- ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
- ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
- ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
- pushgateway:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "pushgateway"
- restart_policy:
- condition: any
- environment:
- PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
- PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
- labels:
- com.mirantis.monitoring: "pushgateway"
- image: ${_param:docker_image_pushgateway}
- ports:
- - 15012:${prometheus:pushgateway:bind:port}
- server:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "prometheus"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "prometheus"
- image: ${_param:docker_image_prometheus}
- ports:
- - 15010:${prometheus:server:bind:port}
- volumes:
- - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
- - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
- environment:
- PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
- PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
- PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
- PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
- PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
- PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
- # Backward compatibility for Prometheus 1.7
- PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
- PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
- PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
-
\ No newline at end of file
+- system.docker.swarm.stack.monitoring.remote_storage_adapter
diff --git a/docker/swarm/stack/monitoring/prometheus/global.yml b/docker/swarm/stack/monitoring/prometheus/global.yml
new file mode 100644
index 0000000..d86f456
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/global.yml
@@ -0,0 +1,9 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ server:
+ deploy:
+ mode: global
diff --git a/docker/swarm/stack/monitoring/prometheus/init.yml b/docker/swarm/stack/monitoring/prometheus/init.yml
new file mode 100644
index 0000000..2d455f7
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/init.yml
@@ -0,0 +1,45 @@
+classes:
+- system.prometheus.server.container
+parameters:
+ _param:
+ # Backward compatibility for Prometheus 1.7
+ prometheus_storage_local_engine: "persisted"
+ prometheus_storage_heap_size: 3221225472
+ prometheus_storage_num_fingerprint_mutexes: 4096
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ server:
+ networks:
+ - monitoring
+ deploy:
+ labels:
+ com.mirantis.monitoring: "prometheus"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "prometheus"
+ image: ${_param:docker_image_prometheus}
+ ports:
+ - 15010:${prometheus:server:bind:port}
+ volumes:
+ - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
+ - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
+ environment:
+ PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
+ PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
+ PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
+ PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
+ PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
+ PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
+ # Backward compatibility for Prometheus 1.7
+ PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
+ PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
+ PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
diff --git a/docker/swarm/stack/monitoring/prometheus/replicated.yml b/docker/swarm/stack/monitoring/prometheus/replicated.yml
new file mode 100644
index 0000000..c201172
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/replicated.yml
@@ -0,0 +1,9 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ server:
+ deploy:
+ replicas: 2
diff --git a/docker/swarm/stack/monitoring/prometheus_global.yml b/docker/swarm/stack/monitoring/prometheus_global.yml
index 9745638..6d8e4ba 100644
--- a/docker/swarm/stack/monitoring/prometheus_global.yml
+++ b/docker/swarm/stack/monitoring/prometheus_global.yml
@@ -1,131 +1,8 @@
classes:
-- system.prometheus.alertmanager.container
-- system.prometheus.pushgateway.container
-- system.prometheus.remote_storage_adapter.container
-- system.prometheus.server.container
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
- system.docker.swarm.stack.monitoring.remote_agent
-parameters:
- _param:
- # Backward compatibility for Prometheus 1.7
- prometheus_storage_local_engine: "persisted"
- prometheus_storage_heap_size: 3221225472
- prometheus_storage_num_fingerprint_mutexes: 4096
-
- docker:
- client:
- stack:
- monitoring:
- network:
- monitoring:
- driver: overlay
- driver_opts:
- encrypted: 1
- service:
- relay:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "relay"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "relay"
- image: ${_param:docker_image_prometheus_relay}
- ports:
- - 15016:8080
- environment:
- PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
- remote_storage_adapter:
- networks:
- - monitoring
- deploy:
- replicas: 1
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- image: ${_param:docker_image_remote_storage_adapter}
- ports:
- - 15015:${prometheus:remote_storage_adapter:bind:port}
- environment:
- RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
- RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
- RSA_INFLUXDB_RETENTION_POLICY: 'lma'
- RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
- RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
- RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
- RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
- alertmanager:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "alertmanager"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "alertmanager"
- image: ${_param:docker_image_alertmanager}
- ports:
- - 15011:${prometheus:alertmanager:bind:port}
- volumes:
- - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
- - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
- environment:
- ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
- ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
- ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
- ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
- ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
- ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
- pushgateway:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "pushgateway"
- restart_policy:
- condition: any
- environment:
- PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
- PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
- labels:
- com.mirantis.monitoring: "pushgateway"
- image: ${_param:docker_image_pushgateway}
- ports:
- - 15012:${prometheus:pushgateway:bind:port}
- server:
- networks:
- - monitoring
- deploy:
- mode: global
- labels:
- com.mirantis.monitoring: "prometheus"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "prometheus"
- image: ${_param:docker_image_prometheus}
- ports:
- - 15010:${prometheus:server:bind:port}
- volumes:
- - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
- - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
- environment:
- PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
- PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
- PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
- PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
- PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
- PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
- # Backward compatibility for Prometheus 1.7
- PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
- PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
- PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
- PROMETHEUS_USE_STATIC_DATADIR: "true"
+- system.docker.swarm.stack.monitoring.remote_storage_adapter
diff --git a/docker/swarm/stack/monitoring/prometheus_relay.yml b/docker/swarm/stack/monitoring/prometheus_relay.yml
new file mode 100644
index 0000000..315ba1d
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus_relay.yml
@@ -0,0 +1,27 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ relay:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "relay"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "relay"
+ image: ${_param:docker_image_prometheus_relay}
+ ports:
+ - 15016:8080
+ environment:
+ PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
diff --git a/docker/swarm/stack/monitoring/pushgateway.yml b/docker/swarm/stack/monitoring/pushgateway.yml
new file mode 100644
index 0000000..af108a6
--- /dev/null
+++ b/docker/swarm/stack/monitoring/pushgateway.yml
@@ -0,0 +1,30 @@
+classes:
+- system.prometheus.pushgateway.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ pushgateway:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "pushgateway"
+ restart_policy:
+ condition: any
+ environment:
+ PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
+ PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
+ labels:
+ com.mirantis.monitoring: "pushgateway"
+ image: ${_param:docker_image_pushgateway}
+ ports:
+ - 15012:${prometheus:pushgateway:bind:port}
diff --git a/docker/swarm/stack/monitoring/remote_storage_adapter.yml b/docker/swarm/stack/monitoring/remote_storage_adapter.yml
new file mode 100644
index 0000000..04ffb90
--- /dev/null
+++ b/docker/swarm/stack/monitoring/remote_storage_adapter.yml
@@ -0,0 +1,35 @@
+classes:
+- system.prometheus.remote_storage_adapter.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ remote_storage_adapter:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ image: ${_param:docker_image_remote_storage_adapter}
+ ports:
+ - 15015:${prometheus:remote_storage_adapter:bind:port}
+ environment:
+ RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
+ RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
+ RSA_INFLUXDB_RETENTION_POLICY: 'lma'
+ RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
+ RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
+ RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
+ RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
diff --git a/fluentd/label/default_output/elasticsearch.yml b/fluentd/label/default_output/elasticsearch.yml
index 3c26d15..84b2dc1 100644
--- a/fluentd/label/default_output/elasticsearch.yml
+++ b/fluentd/label/default_output/elasticsearch.yml
@@ -9,6 +9,19 @@
config:
label:
default_output:
+ filter:
+ drop_nested_timestamp_and_sensitive_data:
+ tag: "openstack.**"
+ type: record_transformer
+ enable_ruby: true
+ remove_keys: '["_dummy_1", "_dummy_2", "_dummy_3"]'
+ record:
+ - name: _dummy_1
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("timestamp") ; end; nil }
+ - name: _dummy_2
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("auth_token"); end; nil}
+ - name: _dummy_3
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("auth_token_info"); end; nil}
match:
elasticsearch_output:
host: ${_param:fluentd_elasticsearch_host}
diff --git a/glusterfs/client/volume/backup.yml b/glusterfs/client/volume/backup.yml
new file mode 100644
index 0000000..eded1ac
--- /dev/null
+++ b/glusterfs/client/volume/backup.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ backup_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ backup:
+ path: /srv/volumes/backup
+ server: ${_param:backup_glusterfs_service_host}
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/backup.yml b/glusterfs/server/volume/backup.yml
new file mode 100644
index 0000000..22e59e2
--- /dev/null
+++ b/glusterfs/server/volume/backup.yml
@@ -0,0 +1,18 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ backup:
+ storage: /srv/glusterfs/backup
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/backup
+ - ${_param:cluster_node02_address}:/srv/glusterfs/backup
+ - ${_param:cluster_node03_address}:/srv/glusterfs/backup
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
diff --git a/haproxy/proxy/listen/openstack/placement.yml b/haproxy/proxy/listen/openstack/placement.yml
new file mode 100644
index 0000000..f3b2b99
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/placement.yml
@@ -0,0 +1,26 @@
+# Starting with Nova (17.0.0) Queens - accessing to / of placement service
+# returns 200 with version data instead of 401 as it was before.
+# This file should be included for nova/placement higher than Queens.
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ placement_api:
+ type: openstack-service
+ service_name: placement
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8778
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index d9092e0..ba116f8 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -2,6 +2,9 @@
_param:
cluster_public_protocol: https
keystone_service_protocol: http
+ keystone_public_path: "/v2.0"
+ keystone_internal_path: "/v2.0"
+ keystone_admin_path: "/v2.0"
keystone:
client:
server:
@@ -15,12 +18,12 @@
public_address: ${_param:cluster_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 5000
- public_path: '/v2.0'
+ public_path: ${_param:keystone_public_path}
internal_address: ${_param:keystone_service_host}
internal_port: 5000
- internal_path: '/v2.0'
+ internal_path: ${_param:keystone_internal_path}
internal_protocol: ${_param:keystone_service_protocol}
admin_address: ${_param:keystone_service_host}
admin_port: 35357
- admin_path: '/v2.0'
+ admin_path: ${_param:keystone_admin_path}
admin_protocol: ${_param:keystone_service_protocol}
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
deleted file mode 100644
index e2745f1..0000000
--- a/prometheus/server/target/dns.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-parameters:
- prometheus:
- server:
- target:
- dns:
- enabled: true
- endpoint:
- - name: 'pushgateway'
- domain:
- - 'tasks.monitoring_pushgateway'
- type: A
- port: ${prometheus:pushgateway:bind:port}
- - name: 'prometheus'
- domain:
- - 'tasks.monitoring_server'
- type: A
- port: ${prometheus:server:bind:port}
- - name: 'alertmanager'
- domain:
- - 'tasks.monitoring_alertmanager'
- type: A
- port: ${prometheus:alertmanager:bind:port}
- - name: 'remote_agent'
- domain:
- - 'tasks.monitoring_remote_agent'
- type: A
- port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
- - name: 'remote_storage_adapter'
- domain:
- - 'tasks.monitoring_remote_storage_adapter'
- type: A
- port: ${prometheus:remote_storage_adapter:bind:port}
diff --git a/prometheus/server/target/dns/alertmanager.yml b/prometheus/server/target/dns/alertmanager.yml
new file mode 100644
index 0000000..78172d1
--- /dev/null
+++ b/prometheus/server/target/dns/alertmanager.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'alertmanager'
+ domain:
+ - 'tasks.monitoring_alertmanager'
+ type: A
+ port: ${prometheus:alertmanager:bind:port}
diff --git a/prometheus/server/target/dns/init.yml b/prometheus/server/target/dns/init.yml
new file mode 100644
index 0000000..361d296
--- /dev/null
+++ b/prometheus/server/target/dns/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.prometheus.server.target.dns.remote_storage_adapter
diff --git a/prometheus/server/target/dns/prometheus.yml b/prometheus/server/target/dns/prometheus.yml
new file mode 100644
index 0000000..abffe03
--- /dev/null
+++ b/prometheus/server/target/dns/prometheus.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'prometheus'
+ domain:
+ - 'tasks.monitoring_server'
+ type: A
+ port: ${prometheus:server:bind:port}
diff --git a/prometheus/server/target/dns/pushgateway.yml b/prometheus/server/target/dns/pushgateway.yml
new file mode 100644
index 0000000..9022fa7
--- /dev/null
+++ b/prometheus/server/target/dns/pushgateway.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'pushgateway'
+ domain:
+ - 'tasks.monitoring_pushgateway'
+ type: A
+ port: ${prometheus:pushgateway:bind:port}
\ No newline at end of file
diff --git a/prometheus/server/target/dns/remote_agent.yml b/prometheus/server/target/dns/remote_agent.yml
new file mode 100644
index 0000000..6801ffc
--- /dev/null
+++ b/prometheus/server/target/dns/remote_agent.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'remote_agent'
+ domain:
+ - 'tasks.monitoring_remote_agent'
+ type: A
+ port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
diff --git a/prometheus/server/target/dns/remote_storage_adapter.yml b/prometheus/server/target/dns/remote_storage_adapter.yml
new file mode 100644
index 0000000..618f438
--- /dev/null
+++ b/prometheus/server/target/dns/remote_storage_adapter.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'remote_storage_adapter'
+ domain:
+ - 'tasks.monitoring_remote_storage_adapter'
+ type: A
+ port: ${prometheus:remote_storage_adapter:bind:port}