Update Elasticsearch and Fluent-Logging configurations

This updates the Elasticsearch and Fluent-logging charts to use
the most recent configuration keys in their values overrides, and
also introduces support for the ceph-rgw s3 api for use for
Elasticsearch snapshot repositories

Change-Id: Ia998db9006350a22fcc7dc3052301d7a5b8259f4
This commit is contained in:
Steve Wilkerson 2018-11-05 15:07:09 -06:00
parent 15ef036535
commit 0a1ba88004
13 changed files with 564 additions and 45 deletions

View File

@ -102,6 +102,7 @@ data:
prometheus-server: enabled prometheus-server: enabled
prometheus-client: enabled prometheus-client: enabled
fluentd: enabled fluentd: enabled
fluentbit: enabled
influxdb: enabled influxdb: enabled
kibana: enabled kibana: enabled
elasticsearch-client: enabled elasticsearch-client: enabled

View File

@ -61,4 +61,5 @@ data:
openstack-libvirt: kernel openstack-libvirt: kernel
beta.kubernetes.io/fluentd-ds-ready: 'true' beta.kubernetes.io/fluentd-ds-ready: 'true'
node-exporter: enabled node-exporter: enabled
fluentbit: enabled
... ...

View File

@ -54,6 +54,18 @@ metadata:
path: .osh_infra.elasticsearch.admin path: .osh_infra.elasticsearch.admin
dest: dest:
path: .values.endpoints.elasticsearch.auth.admin path: .values.endpoints.elasticsearch.auth.admin
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
path: .osh_infra.ceph_object_store.admin
dest:
path: .values.endpoints.ceph_object_store.auth.admin
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
path: .osh_infra.ceph_object_store.elasticsearch
dest:
path: .values.endpoints.ceph_object_store.auth.elasticsearch
# Secrets # Secrets
- dest: - dest:
@ -62,6 +74,30 @@ metadata:
schema: deckhand/Passphrase/v1 schema: deckhand/Passphrase/v1
name: osh_infra_elasticsearch_admin_password name: osh_infra_elasticsearch_admin_password
path: . path: .
- dest:
path: .values.endpoints.ceph_object_store.auth.admin.access_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_admin_access_key
path: .
- dest:
path: .values.endpoints.ceph_object_store.auth.admin.secret_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_admin_secret_key
path: .
- dest:
path: .values.endpoints.ceph_object_store.auth.elasticsearch.access_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_elasticsearch_access_key
path: .
- dest:
path: .values.endpoints.ceph_object_store.auth.elasticsearch.secret_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_elasticsearch_secret_key
path: .
# LDAP Details # LDAP Details
- src: - src:
@ -97,6 +133,75 @@ data:
post: post:
create: [] create: []
values: values:
pod:
replicas:
client: 5
resources:
enabled: true
apache_proxy:
limits:
memory: "1024Mi"
cpu: "2000m"
requests:
memory: "0"
cpu: "0"
client:
requests:
memory: "8Gi"
cpu: "1000m"
limits:
memory: "16Gi"
cpu: "2000m"
master:
requests:
memory: "8Gi"
cpu: "1000m"
limits:
memory: "16Gi"
cpu: "2000m"
data:
requests:
memory: "8Gi"
cpu: "1000m"
limits:
memory: "16Gi"
cpu: "2000m"
prometheus_elasticsearch_exporter:
requests:
memory: "0"
cpu: "0"
limits:
memory: "1024Mi"
cpu: "2000m"
jobs:
curator:
requests:
memory: "0"
cpu: "0"
limits:
memory: "1024Mi"
cpu: "2000m"
image_repo_sync:
requests:
memory: "0"
cpu: "0"
limits:
memory: "1024Mi"
cpu: "2000m"
snapshot_repository:
requests:
memory: "0"
cpu: "0"
limits:
memory: "1024Mi"
cpu: "2000m"
tests:
requests:
memory: "0"
cpu: "0"
limits:
memory: "1024Mi"
cpu: "2000m"
labels: labels:
elasticsearch: elasticsearch:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -108,27 +213,95 @@ data:
prometheus: prometheus:
enabled: true enabled: true
conf: conf:
apache: httpd: |
host: | ServerRoot "/usr/local/apache2"
<VirtualHost *:80> Listen 80
<Location /> LoadModule mpm_event_module modules/mod_mpm_event.so
ProxyPass http://localhost:{{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/ LoadModule authn_file_module modules/mod_authn_file.so
ProxyPassReverse http://localhost:{{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/ LoadModule authn_core_module modules/mod_authn_core.so
</Location> LoadModule authz_host_module modules/mod_authz_host.so
<Proxy *> LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
AuthName "Elasticsearch" LoadModule authz_user_module modules/mod_authz_user.so
AuthType Basic LoadModule authz_core_module modules/mod_authz_core.so
AuthBasicProvider file ldap LoadModule access_compat_module modules/mod_access_compat.so
AuthUserFile /usr/local/apache2/conf/.htpasswd LoadModule auth_basic_module modules/mod_auth_basic.so
AuthLDAPBindDN {{ .Values.endpoints.ldap.auth.admin.bind }} LoadModule ldap_module modules/mod_ldap.so
AuthLDAPBindPassword {{ .Values.endpoints.ldap.auth.admin.password }} LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
AuthLDAPURL {{ tuple "ldap" "public" "ldap" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} LoadModule reqtimeout_module modules/mod_reqtimeout.so
Require valid-user LoadModule filter_module modules/mod_filter.so
</Proxy> LoadModule proxy_html_module modules/mod_proxy_html.so
</VirtualHost> LoadModule log_config_module modules/mod_log_config.so
LoadModule env_module modules/mod_env.so
LoadModule headers_module modules/mod_headers.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule version_module modules/mod_version.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_connect_module modules/mod_proxy_connect.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
LoadModule unixd_module modules/mod_unixd.so
LoadModule status_module modules/mod_status.so
LoadModule autoindex_module modules/mod_autoindex.so
<IfModule unixd_module>
User daemon
Group daemon
</IfModule>
<Directory />
AllowOverride none
Require all denied
</Directory>
<Files ".ht*">
Require all denied
</Files>
ErrorLog /dev/stderr
LogLevel warn
<IfModule log_config_module>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
<IfModule logio_module>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
</IfModule>
CustomLog /dev/stdout common
CustomLog /dev/stdout combined
</IfModule>
<Directory "/usr/local/apache2/cgi-bin">
AllowOverride None
Options None
Require all granted
</Directory>
<IfModule headers_module>
RequestHeader unset Proxy early
</IfModule>
<IfModule proxy_html_module>
Include conf/extra/proxy-html.conf
</IfModule>
<VirtualHost *:80>
<Location />
ProxyPass http://localhost:{{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/
ProxyPassReverse http://localhost:{{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/
</Location>
<Proxy *>
AuthName "Elasticsearch"
AuthType Basic
AuthBasicProvider file ldap
AuthUserFile /usr/local/apache2/conf/.htpasswd
AuthLDAPBindDN {{ .Values.endpoints.ldap.auth.admin.bind }}
AuthLDAPBindPassword {{ .Values.endpoints.ldap.auth.admin.password }}
AuthLDAPURL {{ tuple "ldap" "public" "ldap" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | quote }}
Require valid-user
</Proxy>
</VirtualHost>
elasticsearch: elasticsearch:
config:
http:
max_content_length: 2gb
pipelining: false
env: env:
java_opts: "-Xms5g -Xmx5g" java_opts: "-Xms8g -Xmx8g"
snapshots:
enabled: true
curator: curator:
#run every 6th hour #run every 6th hour
schedule: "0 */6 * * *" schedule: "0 */6 * * *"

View File

@ -82,12 +82,54 @@ data:
post: post:
create: [] create: []
values: values:
monitoring:
prometheus:
enabled: true
pod:
resources:
enabled: true
fluentbit:
limits:
memory: '4Gi'
cpu: '2000m'
requests:
memory: '2Gi'
cpu: '1000m'
fluentd:
limits:
memory: '4Gi'
cpu: '2000m'
requests:
memory: '2Gi'
cpu: '1000m'
prometheus_fluentd_exporter:
limits:
memory: '1024Mi'
cpu: '2000m'
requests:
memory: '0'
cpu: '0'
jobs:
image_repo_sync:
requests:
memory: '0'
cpu: '0'
limits:
memory: '1024Mi'
cpu: '2000m'
tests:
requests:
memory: '0'
cpu: '0'
limits:
memory: '1024Mi'
cpu: '2000m'
labels: labels:
fluentd: fluentd:
node_selector_key: openstack-control-plane node_selector_key: fluentd
node_selector_value: enabled node_selector_value: enabled
fluentbit: fluentbit:
node_selector_key: openstack-control-plane node_selector_key: fluentbit
node_selector_value: enabled node_selector_value: enabled
prometheus_fluentd_exporter: prometheus_fluentd_exporter:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -95,20 +137,6 @@ data:
job: job:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
dependencies:
static:
fluentbit:
jobs: ""
services:
- endpoint: internal
service: fluentd
fluentd:
jobs: ""
services:
- endpoint: internal
service: elasticsearch
manifests:
job_elasticsearch_template: false
conf: conf:
fluentbit: fluentbit:
- service: - service:
@ -117,11 +145,67 @@ data:
Daemon: Off Daemon: Off
Log_Level: info Log_Level: info
Parsers_File: parsers.conf Parsers_File: parsers.conf
- kernel_messages:
header: input
Name: tail
Tag: kernel
Path: /var/log/kern.log
DB: /var/log/kern.db
Mem_Buf_Limit: 5MB
DB.Sync: Normal
Buffer_Chunk_Size: 1M
Buffer_Max_Size: 1M
- kubelet:
header: input
Name: systemd
Tag: journal.*
Path: ${JOURNAL_PATH}
Systemd_Filter: _SYSTEMD_UNIT=kubelet.service
DB: /var/log/kubelet.db
Mem_Buf_Limit: 5MB
DB.Sync: Normal
Buffer_Chunk_Size: 1M
Buffer_Max_Size: 1M
- docker_daemon:
header: input
Name: systemd
Tag: journal.*
Path: ${JOURNAL_PATH}
Systemd_Filter: _SYSTEMD_UNIT=docker.service
DB: /var/log/docker.db
Mem_Buf_Limit: 5MB
DB.Sync: Normal
Buffer_Chunk_Size: 1M
Buffer_Max_Size: 1M
- kernel_record_modifier:
header: filter
Name: record_modifier
Match: kernel
Record: hostname ${HOSTNAME}
- systemd_modify_fields:
header: filter
Name: modify
Match: journal.**
Rename:
_BOOT_ID: BOOT_ID
_CAP_EFFECTIVE: CAP_EFFECTIVE
_CMDLINE: CMDLINE
_COMM: COMM
_EXE: EXE
_GID: GID
_HOSTNAME: HOSTNAME
_MACHINE_ID: MACHINE_ID
_PID: PID
_SYSTEMD_CGROUP: SYSTEMD_CGROUP
_SYSTEMD_SLICE: SYSTEMD_SLICE
_SYSTEMD_UNIT: SYSTEMD_UNIT
_UID: UID
_TRANSPORT: TRANSPORT
- ceph_cluster_logs: - ceph_cluster_logs:
header: input header: input
Name: tail Name: tail
Tag: ceph.cluster.* Tag: ceph.cluster.*
Path: /var/log/ceph/ceph.log Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.log
DB: /var/log/ceph.db DB: /var/log/ceph.db
Parsers: syslog Parsers: syslog
Mem_Buf_Limit: 5MB Mem_Buf_Limit: 5MB
@ -132,7 +216,7 @@ data:
header: input header: input
Name: tail Name: tail
Tag: ceph.audit.* Tag: ceph.audit.*
Path: /var/log/ceph/ceph.audit.log Path: /var/log/ceph/airship-ucp-ceph-mon/ceph.audit.log
DB: /var/log/ceph.db DB: /var/log/ceph.db
Parsers: syslog Parsers: syslog
Mem_Buf_Limit: 5MB Mem_Buf_Limit: 5MB
@ -143,7 +227,7 @@ data:
header: input header: input
Name: tail Name: tail
Tag: ceph.mon.* Tag: ceph.mon.*
Path: /var/log/ceph/ceph-mon**.log Path: /var/log/ceph/airship-ucp-ceph-mon/ceph-mon**.log
DB: /var/log/ceph.db DB: /var/log/ceph.db
Parsers: syslog Parsers: syslog
Mem_Buf_Limit: 5MB Mem_Buf_Limit: 5MB
@ -154,7 +238,7 @@ data:
header: input header: input
Name: tail Name: tail
Tag: ceph.osd.* Tag: ceph.osd.*
Path: /var/log/ceph/ceph-osd**.log Path: /var/log/ceph/airship-ucp-ceph-osd/ceph-osd**.log
DB: /var/log/ceph.db DB: /var/log/ceph.db
Parsers: syslog Parsers: syslog
Mem_Buf_Limit: 5MB Mem_Buf_Limit: 5MB
@ -172,6 +256,10 @@ data:
Buffer_Chunk_Size: 1M Buffer_Chunk_Size: 1M
Buffer_Max_Size: 1M Buffer_Max_Size: 1M
Mem_Buf_Limit: 5MB Mem_Buf_Limit: 5MB
- drop_fluentd_logs:
header: output
Name: "null"
Match: "**.fluentd**"
- kube_filter: - kube_filter:
header: filter header: filter
Name: kubernetes Name: kubernetes
@ -183,7 +271,7 @@ data:
Match: "*" Match: "*"
Host: ${FLUENTD_HOST} Host: ${FLUENTD_HOST}
Port: ${FLUENTD_PORT} Port: ${FLUENTD_PORT}
td_agent: fluentd:
- metrics_agent: - metrics_agent:
header: source header: source
type: monitor_agent type: monitor_agent
@ -194,12 +282,48 @@ data:
type: forward type: forward
port: "#{ENV['FLUENTD_PORT']}" port: "#{ENV['FLUENTD_PORT']}"
bind: 0.0.0.0 bind: 0.0.0.0
- filter_fluentd_logs:
header: match
expression: "fluent.**"
type: "null"
- journal_elasticsearch:
header: match
type: elasticsearch
user: "#{ENV['ELASTICSEARCH_USERNAME']}"
password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
expression: "journal.**"
include_tag_key: true
host: "#{ENV['ELASTICSEARCH_HOST']}"
port: "#{ENV['ELASTICSEARCH_PORT']}"
logstash_format: true
logstash_prefix: journal
buffer_chunk_limit: 2M
buffer_queue_limit: 8
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
- kernel_elasticsearch:
header: match
type: elasticsearch
user: "#{ENV['ELASTICSEARCH_USERNAME']}"
password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
expression: "kernel"
include_tag_key: true
host: "#{ENV['ELASTICSEARCH_HOST']}"
port: "#{ENV['ELASTICSEARCH_PORT']}"
logstash_format: true
logstash_prefix: kernel
buffer_chunk_limit: 2M
buffer_queue_limit: 8
flush_interval: "10"
max_retry_wait: 300
disable_retry_limit: ""
- ceph_elasticsearch: - ceph_elasticsearch:
header: match header: match
type: elasticsearch type: elasticsearch
user: "#{ENV['ELASTICSEARCH_USERNAME']}" user: "#{ENV['ELASTICSEARCH_USERNAME']}"
password: "#{ENV['ELASTICSEARCH_PASSWORD']}" password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
expression: "ceph**" expression: "**ceph-**.log"
include_tag_key: true include_tag_key: true
host: "#{ENV['ELASTICSEARCH_HOST']}" host: "#{ENV['ELASTICSEARCH_HOST']}"
port: "#{ENV['ELASTICSEARCH_PORT']}" port: "#{ENV['ELASTICSEARCH_PORT']}"
@ -207,11 +331,30 @@ data:
logstash_prefix: ceph logstash_prefix: ceph
buffer_chunk_limit: 10M buffer_chunk_limit: 10M
buffer_queue_limit: 32 buffer_queue_limit: 32
flush_interval: "20" flush_interval: "10"
max_retry_wait: 300 max_retry_wait: 300
disable_retry_limit: "" disable_retry_limit: ""
num_threads: 8 num_threads: 8
type_name: ceph_logs - oslo_fluentd_elasticsearch:
header: match
type: elasticsearch
user: "#{ENV['ELASTICSEARCH_USERNAME']}"
password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
expression: "**.openstack.*"
include_tag_key: true
host: "#{ENV['ELASTICSEARCH_HOST']}"
port: "#{ENV['ELASTICSEARCH_PORT']}"
logstash_format: true
logstash_prefix: openstack
buffer_type: memory
buffer_chunk_limit: 10M
buffer_queue_limit: 512
flush_interval: "10"
max_retry_wait: 300
request_timeout: 60
disable_retry_limit: ""
num_threads: 8
type_name: oslo_openstack_fluentd
- elasticsearch: - elasticsearch:
header: match header: match
type: elasticsearch type: elasticsearch
@ -223,8 +366,8 @@ data:
port: "#{ENV['ELASTICSEARCH_PORT']}" port: "#{ENV['ELASTICSEARCH_PORT']}"
logstash_format: true logstash_format: true
buffer_chunk_limit: 10M buffer_chunk_limit: 10M
buffer_queue_limit: 32 buffer_queue_limit: 32g
flush_interval: "20" flush_interval: "10"
max_retry_wait: 300 max_retry_wait: 300
disable_retry_limit: "" disable_retry_limit: ""
num_threads: 8 num_threads: 8

View File

@ -0,0 +1,13 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-radosgw
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
data:
description: Deploy Radosgw for OSH-Infra
chart_group:
- osh-infra-radosgw

View File

@ -0,0 +1,118 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-radosgw
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
# Chart source
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.ceph-rgw
dest:
path: .source
# Images
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .images.ceph.ceph-rgw
dest:
path: .values.images.tags
# IP addresses
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .storage.ceph.public_cidr
dest:
path: .values.network.public
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .storage.ceph.cluster_cidr
dest:
path: .values.network.cluster
# Endpoints
- src:
schema: pegleg/EndpointCatalogue/v1
name: osh_infra_endpoints
path: .osh_infra.ceph_object_store
dest:
path: .values.endpoints.ceph_object_store
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ceph.ceph_mon
dest:
path: .values.endpoints.ceph_mon
# Credentials
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
path: .osh_infra.ceph_object_store.admin
dest:
path: .values.endpoints.ceph_object_store.auth.admin
# Secrets
- dest:
path: .values.endpoints.ceph_object_store.auth.admin.access_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_admin_access_key
path: .
- dest:
path: .values.endpoints.ceph_object_store.auth.admin.secret_key
src:
schema: deckhand/Passphrase/v1
name: osh_infra_rgw_s3_admin_secret_key
path: .
data:
chart_name: osh-infra-radosgw
release: osh-infra-radosgw
namespace: osh-infra
wait:
timeout: 900
labels:
release_group: clcp-osh-infra-radosgw
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: clcp-osh-infra-radosgw
values:
labels:
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
rgw:
node_selector_key: ceph-rgw
node_selector_value: enabled
deployment:
storage_secrets: false
ceph: true
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: false
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: false
conf:
rgw_s3:
enabled: true
ceph_client:
configmap: ceph-etc
dependencies:
- osh-infra-helm-toolkit
...

View File

@ -31,6 +31,7 @@ data:
- ucp-shipyard - ucp-shipyard
- osh-infra-ingress-controller - osh-infra-ingress-controller
- osh-infra-ceph-config - osh-infra-ceph-config
- osh-infra-radosgw
- osh-infra-logging - osh-infra-logging
- osh-infra-monitoring - osh-infra-monitoring
- osh-infra-mariadb - osh-infra-mariadb

View File

@ -0,0 +1,11 @@
---
schema: deckhand/Passphrase/v1
metadata:
schema: metadata/Document/v1
name: osh_infra_rgw_s3_admin_access_key
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data: password123
...

View File

@ -0,0 +1,11 @@
---
schema: deckhand/Passphrase/v1
metadata:
schema: metadata/Document/v1
name: osh_infra_rgw_s3_admin_secret_key
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data: password123
...

View File

@ -0,0 +1,11 @@
---
schema: deckhand/Passphrase/v1
metadata:
schema: metadata/Document/v1
name: osh_infra_rgw_s3_elasticsearch_access_key
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data: password123
...

View File

@ -0,0 +1,11 @@
---
schema: deckhand/Passphrase/v1
metadata:
schema: metadata/Document/v1
name: osh_infra_rgw_s3_elasticsearch_secret_key
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data: password123
...

View File

@ -1008,6 +1008,22 @@ metadata:
pattern: AUTH_PATH pattern: AUTH_PATH
data: data:
osh_infra: osh_infra:
ceph_object_store:
name: radosgw
namespace: osh-infra
hosts:
default: ceph-rgw
public: radosgw
host_fqdn_override:
default: null
path:
default: null
scheme:
default: "http"
port:
api:
default: 8088
public: 80
elasticsearch: elasticsearch:
name: elasticsearch name: elasticsearch
namespace: osh-infra namespace: osh-infra
@ -1023,8 +1039,12 @@ data:
scheme: scheme:
default: "http" default: "http"
port: port:
client:
default: 9200
http: http:
default: 80 default: 80
discovery:
default: 9300
prometheus_elasticsearch_exporter: prometheus_elasticsearch_exporter:
namespace: null namespace: null
hosts: hosts:

View File

@ -383,6 +383,11 @@ metadata:
path: .osh_infra.prometheus_openstack_exporter.user.region_name path: .osh_infra.prometheus_openstack_exporter.user.region_name
data: data:
osh_infra: osh_infra:
ceph_object_store:
admin:
username: s3_admin
elasticsearch:
username: elasticsearch
grafana: grafana:
admin: admin:
username: grafana username: grafana