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:
Chinasubbareddy M
Kaspars Skels
parent
25e34e057d
commit
b45c02ff0b
@ -117,6 +117,50 @@ data:
|
||||
Daemon: Off
|
||||
Log_Level: info
|
||||
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:
|
||||
header: input
|
||||
Name: tail
|
||||
@ -150,6 +194,24 @@ data:
|
||||
type: forward
|
||||
port: "#{ENV['FLUENTD_PORT']}"
|
||||
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:
|
||||
header: match
|
||||
type: elasticsearch
|
||||
@ -162,10 +224,20 @@ data:
|
||||
logstash_format: true
|
||||
buffer_chunk_limit: 10M
|
||||
buffer_queue_limit: 32
|
||||
flush_interval: 20s
|
||||
flush_interval: "20"
|
||||
max_retry_wait: 300
|
||||
disable_retry_limit: ""
|
||||
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:
|
||||
- osh-infra-helm-toolkit
|
||||
...
|
||||
|
||||
@ -235,6 +235,7 @@ data:
|
||||
target:
|
||||
osd: 1
|
||||
pg_per_osd: 100
|
||||
protected: false
|
||||
|
||||
default:
|
||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||
|
||||
@ -57,12 +57,6 @@ metadata:
|
||||
path: .ceph.tenant_ceph_mon
|
||||
dest:
|
||||
path: .values.endpoints.ceph_mon
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: osh_infra_endpoints
|
||||
path: .osh_infra.fluentd
|
||||
dest:
|
||||
path: .values.endpoints.fluentd
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: ucp_endpoints
|
||||
@ -122,8 +116,6 @@ data:
|
||||
labels:
|
||||
release_group: airship-tenant-ceph-mon
|
||||
values:
|
||||
logging:
|
||||
fluentd: true
|
||||
labels:
|
||||
job:
|
||||
node_selector_key: tenant-ceph-control-plane
|
||||
|
||||
@ -57,12 +57,6 @@ metadata:
|
||||
path: .ceph.tenant_ceph_mon
|
||||
dest:
|
||||
path: .values.endpoints.ceph_mon
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: osh_infra_endpoints
|
||||
path: .osh_infra.fluentd
|
||||
dest:
|
||||
path: .values.endpoints.fluentd
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: ucp_endpoints
|
||||
@ -117,8 +111,6 @@ data:
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
values:
|
||||
logging:
|
||||
fluentd: true
|
||||
labels:
|
||||
osd:
|
||||
node_selector_key: tenant-ceph-osd
|
||||
|
||||
@ -160,6 +160,7 @@ data:
|
||||
target:
|
||||
osd: 1
|
||||
pg_per_osd: 100
|
||||
protected: false
|
||||
|
||||
default:
|
||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||
|
||||
@ -162,6 +162,7 @@ data:
|
||||
target:
|
||||
osd: 1
|
||||
pg_per_osd: 100
|
||||
protected: false
|
||||
|
||||
default:
|
||||
# NOTE(alanmeadows): This is required ATM for bootstrapping a Ceph
|
||||
|
||||
@ -57,12 +57,6 @@ metadata:
|
||||
path: .ceph.ceph_mon
|
||||
dest:
|
||||
path: .values.endpoints.ceph_mon
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: osh_infra_endpoints
|
||||
path: .osh_infra.fluentd
|
||||
dest:
|
||||
path: .values.endpoints.fluentd
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: ucp_endpoints
|
||||
@ -122,8 +116,6 @@ data:
|
||||
labels:
|
||||
release_group: airship-ucp-ceph-mon
|
||||
values:
|
||||
logging:
|
||||
fluentd: false
|
||||
labels:
|
||||
job:
|
||||
node_selector_key: ucp-control-plane
|
||||
|
||||
@ -57,12 +57,6 @@ metadata:
|
||||
path: .ceph.ceph_mon
|
||||
dest:
|
||||
path: .values.endpoints.ceph_mon
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: osh_infra_endpoints
|
||||
path: .osh_infra.fluentd
|
||||
dest:
|
||||
path: .values.endpoints.fluentd
|
||||
- src:
|
||||
schema: pegleg/EndpointCatalogue/v1
|
||||
name: ucp_endpoints
|
||||
@ -117,8 +111,6 @@ data:
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
values:
|
||||
logging:
|
||||
fluentd: true
|
||||
labels:
|
||||
osd:
|
||||
node_selector_key: ceph-osd
|
||||
|
||||
@ -13,7 +13,7 @@ data:
|
||||
chart_group:
|
||||
- ucp-ceph-ingress
|
||||
- ucp-ceph-mon
|
||||
- ucp-ceph-osd-update
|
||||
- ucp-ceph-osd
|
||||
- ucp-ceph-client-update
|
||||
- ucp-ceph-provisioners
|
||||
- ucp-ceph-rgw
|
||||
|
||||
@ -258,32 +258,32 @@ data:
|
||||
type: git
|
||||
ceph-client:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-client
|
||||
type: git
|
||||
ceph-htk:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
ceph-mon:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-mon
|
||||
type: git
|
||||
ceph-osd:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-osd
|
||||
type: git
|
||||
ceph-provisioners:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-provisioners
|
||||
type: git
|
||||
ceph-rgw:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-rgw
|
||||
type: git
|
||||
deckhand:
|
||||
@ -408,32 +408,32 @@ data:
|
||||
type: git
|
||||
tenant-ceph-client:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-client
|
||||
type: git
|
||||
tenant-ceph-htk:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
tenant-ceph-mon:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-mon
|
||||
type: git
|
||||
tenant-ceph-osd:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-osd
|
||||
type: git
|
||||
tenant-ceph-provisioners:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-provisioners
|
||||
type: git
|
||||
tenant-ceph-rgw:
|
||||
location: https://git.openstack.org/openstack/openstack-helm-infra
|
||||
reference: 6e092c908c2adf2bda50c190cbcf5ec02f071790
|
||||
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
|
||||
subpath: ceph-rgw
|
||||
type: git
|
||||
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
|
||||
data:
|
||||
values:
|
||||
labels:
|
||||
osd:
|
||||
node_selector_key: ceph-bootstrap
|
||||
node_selector_value: enabled
|
||||
conf:
|
||||
storage:
|
||||
# NEWSITE-CHANGEME: The OSD count and configuration here should not need
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user