Ceph: uplift ceph charts
This is to uplift ceph charts which will Initialize OSDs with a crush weight of 0 to prevent automatic rebalancing the osds joing the cluster This also updates the ceph-osd and ceph-mon versions to include the update to remove the fluentbit sidecar containers. This also updates fluentd's configuration to target the ceph logs mounted via the new hostpath Change-Id: Id912291d47850cd56fc68abaf0e3edadd9a5e31f
This commit is contained in:
parent
25e34e057d
commit
b45c02ff0b
|
@ -117,6 +117,50 @@ data:
|
||||||
Daemon: Off
|
Daemon: Off
|
||||||
Log_Level: info
|
Log_Level: info
|
||||||
Parsers_File: parsers.conf
|
Parsers_File: parsers.conf
|
||||||
|
- ceph_cluster_logs:
|
||||||
|
header: input
|
||||||
|
Name: tail
|
||||||
|
Tag: ceph.cluster.*
|
||||||
|
Path: /var/log/ceph/ceph.log
|
||||||
|
DB: /var/log/ceph.db
|
||||||
|
Parsers: syslog
|
||||||
|
Mem_Buf_Limit: 5MB
|
||||||
|
DB.Sync: Normal
|
||||||
|
Buffer_Chunk_Size: 1M
|
||||||
|
Buffer_Max_Size: 1M
|
||||||
|
- ceph_audit_logs:
|
||||||
|
header: input
|
||||||
|
Name: tail
|
||||||
|
Tag: ceph.audit.*
|
||||||
|
Path: /var/log/ceph/ceph.audit.log
|
||||||
|
DB: /var/log/ceph.db
|
||||||
|
Parsers: syslog
|
||||||
|
Mem_Buf_Limit: 5MB
|
||||||
|
DB.Sync: Normal
|
||||||
|
Buffer_Chunk_Size: 1M
|
||||||
|
Buffer_Max_Size: 1M
|
||||||
|
- ceph_mon_logs:
|
||||||
|
header: input
|
||||||
|
Name: tail
|
||||||
|
Tag: ceph.mon.*
|
||||||
|
Path: /var/log/ceph/ceph-mon**.log
|
||||||
|
DB: /var/log/ceph.db
|
||||||
|
Parsers: syslog
|
||||||
|
Mem_Buf_Limit: 5MB
|
||||||
|
DB.Sync: Normal
|
||||||
|
Buffer_Chunk_Size: 1M
|
||||||
|
Buffer_Max_Size: 1M
|
||||||
|
- ceph_osd_logs:
|
||||||
|
header: input
|
||||||
|
Name: tail
|
||||||
|
Tag: ceph.osd.*
|
||||||
|
Path: /var/log/ceph/ceph-osd**.log
|
||||||
|
DB: /var/log/ceph.db
|
||||||
|
Parsers: syslog
|
||||||
|
Mem_Buf_Limit: 5MB
|
||||||
|
DB.Sync: Normal
|
||||||
|
Buffer_Chunk_Size: 1M
|
||||||
|
Buffer_Max_Size: 1M
|
||||||
- containers_tail:
|
- containers_tail:
|
||||||
header: input
|
header: input
|
||||||
Name: tail
|
Name: tail
|
||||||
|
@ -150,6 +194,24 @@ data:
|
||||||
type: forward
|
type: forward
|
||||||
port: "#{ENV['FLUENTD_PORT']}"
|
port: "#{ENV['FLUENTD_PORT']}"
|
||||||
bind: 0.0.0.0
|
bind: 0.0.0.0
|
||||||
|
- ceph_elasticsearch:
|
||||||
|
header: match
|
||||||
|
type: elasticsearch
|
||||||
|
user: "#{ENV['ELASTICSEARCH_USERNAME']}"
|
||||||
|
password: "#{ENV['ELASTICSEARCH_PASSWORD']}"
|
||||||
|
expression: "ceph**"
|
||||||
|
include_tag_key: true
|
||||||
|
host: "#{ENV['ELASTICSEARCH_HOST']}"
|
||||||
|
port: "#{ENV['ELASTICSEARCH_PORT']}"
|
||||||
|
logstash_format: true
|
||||||
|
logstash_prefix: ceph
|
||||||
|
buffer_chunk_limit: 10M
|
||||||
|
buffer_queue_limit: 32
|
||||||
|
flush_interval: "20"
|
||||||
|
max_retry_wait: 300
|
||||||
|
disable_retry_limit: ""
|
||||||
|
num_threads: 8
|
||||||
|
type_name: ceph_logs
|
||||||
- elasticsearch:
|
- elasticsearch:
|
||||||
header: match
|
header: match
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
|
@ -162,10 +224,20 @@ data:
|
||||||
logstash_format: true
|
logstash_format: true
|
||||||
buffer_chunk_limit: 10M
|
buffer_chunk_limit: 10M
|
||||||
buffer_queue_limit: 32
|
buffer_queue_limit: 32
|
||||||
flush_interval: 20s
|
flush_interval: "20"
|
||||||
max_retry_wait: 300
|
max_retry_wait: 300
|
||||||
disable_retry_limit: ""
|
disable_retry_limit: ""
|
||||||
num_threads: 8
|
num_threads: 8
|
||||||
|
parsers:
|
||||||
|
- syslog:
|
||||||
|
header: parser
|
||||||
|
Name: syslog
|
||||||
|
Format: regex
|
||||||
|
Regex: '^(?<time>.*[0-9]{2}:[0-9]{2}:[0-9]{2}) (?<host>[^ ]*) (?<app>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? (?<log>.+)$'
|
||||||
|
Time_Key: time
|
||||||
|
Time_Format: "%Y-%m-%dT%H:%M:%S.%L"
|
||||||
|
Time_Keep: On
|
||||||
|
Types: "pid:integer"
|
||||||
dependencies:
|
dependencies:
|
||||||
- osh-infra-helm-toolkit
|
- osh-infra-helm-toolkit
|
||||||
...
|
...
|
||||||
|
|
|
@ -235,6 +235,7 @@ data:
|
||||||
target:
|
target:
|
||||||
osd: 1
|
osd: 1
|
||||||
pg_per_osd: 100
|
pg_per_osd: 100
|
||||||
|
protected: false
|
||||||
|
|
||||||
default:
|
default:
|
||||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||||
|
|
|
@ -57,12 +57,6 @@ metadata:
|
||||||
path: .ceph.tenant_ceph_mon
|
path: .ceph.tenant_ceph_mon
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.ceph_mon
|
path: .values.endpoints.ceph_mon
|
||||||
- src:
|
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
|
||||||
name: osh_infra_endpoints
|
|
||||||
path: .osh_infra.fluentd
|
|
||||||
dest:
|
|
||||||
path: .values.endpoints.fluentd
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
|
@ -122,8 +116,6 @@ data:
|
||||||
labels:
|
labels:
|
||||||
release_group: airship-tenant-ceph-mon
|
release_group: airship-tenant-ceph-mon
|
||||||
values:
|
values:
|
||||||
logging:
|
|
||||||
fluentd: true
|
|
||||||
labels:
|
labels:
|
||||||
job:
|
job:
|
||||||
node_selector_key: tenant-ceph-control-plane
|
node_selector_key: tenant-ceph-control-plane
|
||||||
|
|
|
@ -57,12 +57,6 @@ metadata:
|
||||||
path: .ceph.tenant_ceph_mon
|
path: .ceph.tenant_ceph_mon
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.ceph_mon
|
path: .values.endpoints.ceph_mon
|
||||||
- src:
|
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
|
||||||
name: osh_infra_endpoints
|
|
||||||
path: .osh_infra.fluentd
|
|
||||||
dest:
|
|
||||||
path: .values.endpoints.fluentd
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
|
@ -117,8 +111,6 @@ data:
|
||||||
upgrade:
|
upgrade:
|
||||||
no_hooks: false
|
no_hooks: false
|
||||||
values:
|
values:
|
||||||
logging:
|
|
||||||
fluentd: true
|
|
||||||
labels:
|
labels:
|
||||||
osd:
|
osd:
|
||||||
node_selector_key: tenant-ceph-osd
|
node_selector_key: tenant-ceph-osd
|
||||||
|
|
|
@ -160,6 +160,7 @@ data:
|
||||||
target:
|
target:
|
||||||
osd: 1
|
osd: 1
|
||||||
pg_per_osd: 100
|
pg_per_osd: 100
|
||||||
|
protected: false
|
||||||
|
|
||||||
default:
|
default:
|
||||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||||
|
|
|
@ -162,6 +162,7 @@ data:
|
||||||
target:
|
target:
|
||||||
osd: 1
|
osd: 1
|
||||||
pg_per_osd: 100
|
pg_per_osd: 100
|
||||||
|
protected: false
|
||||||
|
|
||||||
default:
|
default:
|
||||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||||
|
|
|
@ -57,12 +57,6 @@ metadata:
|
||||||
path: .ceph.ceph_mon
|
path: .ceph.ceph_mon
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.ceph_mon
|
path: .values.endpoints.ceph_mon
|
||||||
- src:
|
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
|
||||||
name: osh_infra_endpoints
|
|
||||||
path: .osh_infra.fluentd
|
|
||||||
dest:
|
|
||||||
path: .values.endpoints.fluentd
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
|
@ -122,8 +116,6 @@ data:
|
||||||
labels:
|
labels:
|
||||||
release_group: airship-ucp-ceph-mon
|
release_group: airship-ucp-ceph-mon
|
||||||
values:
|
values:
|
||||||
logging:
|
|
||||||
fluentd: false
|
|
||||||
labels:
|
labels:
|
||||||
job:
|
job:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
|
|
|
@ -57,12 +57,6 @@ metadata:
|
||||||
path: .ceph.ceph_mon
|
path: .ceph.ceph_mon
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.ceph_mon
|
path: .values.endpoints.ceph_mon
|
||||||
- src:
|
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
|
||||||
name: osh_infra_endpoints
|
|
||||||
path: .osh_infra.fluentd
|
|
||||||
dest:
|
|
||||||
path: .values.endpoints.fluentd
|
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
|
@ -117,8 +111,6 @@ data:
|
||||||
upgrade:
|
upgrade:
|
||||||
no_hooks: false
|
no_hooks: false
|
||||||
values:
|
values:
|
||||||
logging:
|
|
||||||
fluentd: true
|
|
||||||
labels:
|
labels:
|
||||||
osd:
|
osd:
|
||||||
node_selector_key: ceph-osd
|
node_selector_key: ceph-osd
|
||||||
|
|
|
@ -13,7 +13,7 @@ data:
|
||||||
chart_group:
|
chart_group:
|
||||||
- ucp-ceph-ingress
|
- ucp-ceph-ingress
|
||||||
- ucp-ceph-mon
|
- ucp-ceph-mon
|
||||||
- ucp-ceph-osd-update
|
- ucp-ceph-osd
|
||||||
- ucp-ceph-client-update
|
- ucp-ceph-client-update
|
||||||
- ucp-ceph-provisioners
|
- ucp-ceph-provisioners
|
||||||
- ucp-ceph-rgw
|
- ucp-ceph-rgw
|
||||||
|
|
|
@ -258,32 +258,32 @@ data:
|
||||||
type: git
|
type: git
|
||||||
ceph-client:
|
ceph-client:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-client
|
subpath: ceph-client
|
||||||
type: git
|
type: git
|
||||||
ceph-htk:
|
ceph-htk:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: helm-toolkit
|
subpath: helm-toolkit
|
||||||
type: git
|
type: git
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-mon
|
subpath: ceph-mon
|
||||||
type: git
|
type: git
|
||||||
ceph-osd:
|
ceph-osd:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-osd
|
subpath: ceph-osd
|
||||||
type: git
|
type: git
|
||||||
ceph-provisioners:
|
ceph-provisioners:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-provisioners
|
subpath: ceph-provisioners
|
||||||
type: git
|
type: git
|
||||||
ceph-rgw:
|
ceph-rgw:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-rgw
|
subpath: ceph-rgw
|
||||||
type: git
|
type: git
|
||||||
deckhand:
|
deckhand:
|
||||||
|
@ -408,32 +408,32 @@ data:
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-client:
|
tenant-ceph-client:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-client
|
subpath: ceph-client
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-htk:
|
tenant-ceph-htk:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: helm-toolkit
|
subpath: helm-toolkit
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-mon:
|
tenant-ceph-mon:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-mon
|
subpath: ceph-mon
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-osd:
|
tenant-ceph-osd:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-osd
|
subpath: ceph-osd
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-provisioners:
|
tenant-ceph-provisioners:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-provisioners
|
subpath: ceph-provisioners
|
||||||
type: git
|
type: git
|
||||||
tenant-ceph-rgw:
|
tenant-ceph-rgw:
|
||||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||||
subpath: ceph-rgw
|
subpath: ceph-rgw
|
||||||
type: git
|
type: git
|
||||||
tiller:
|
tiller:
|
||||||
|
|
|
@ -1,75 +0,0 @@
|
||||||
---
|
|
||||||
# The purpose of this file is to define environment-specific parameters for
|
|
||||||
# ceph-osd
|
|
||||||
schema: armada/Chart/v1
|
|
||||||
metadata:
|
|
||||||
schema: metadata/Document/v1
|
|
||||||
name: ucp-ceph-osd-update
|
|
||||||
layeringDefinition:
|
|
||||||
abstract: false
|
|
||||||
layer: site
|
|
||||||
parentSelector:
|
|
||||||
name: ucp-ceph-osd-global
|
|
||||||
actions:
|
|
||||||
- method: replace
|
|
||||||
path: .values.conf.storage.osd
|
|
||||||
- method: merge
|
|
||||||
path: .
|
|
||||||
storagePolicy: cleartext
|
|
||||||
data:
|
|
||||||
values:
|
|
||||||
conf:
|
|
||||||
storage:
|
|
||||||
# NEWSITE-CHANGEME: The OSD count and configuration here should not need
|
|
||||||
# to change if your HW matches the HW used in this environment.
|
|
||||||
# Otherwise you may need to add or subtract disks to this list.
|
|
||||||
osd:
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdd
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdb1
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sde
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdb2
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdf
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdb3
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdg
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdb4
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdh
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdc1
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdi
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdc2
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdj
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdc3
|
|
||||||
- data:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdk
|
|
||||||
journal:
|
|
||||||
type: block-logical
|
|
||||||
location: /dev/sdc4
|
|
||||||
...
|
|
|
@ -18,10 +18,6 @@ metadata:
|
||||||
storagePolicy: cleartext
|
storagePolicy: cleartext
|
||||||
data:
|
data:
|
||||||
values:
|
values:
|
||||||
labels:
|
|
||||||
osd:
|
|
||||||
node_selector_key: ceph-bootstrap
|
|
||||||
node_selector_value: enabled
|
|
||||||
conf:
|
conf:
|
||||||
storage:
|
storage:
|
||||||
# NEWSITE-CHANGEME: The OSD count and configuration here should not need
|
# NEWSITE-CHANGEME: The OSD count and configuration here should not need
|
||||||
|
|
Loading…
Reference in New Issue