parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Display Ceph health in PVC status as well 

Makes this output a little more realistic and allows proper monitoring
of the Ceph cluster status (separate from the PVC status which is
tracking only OSD up/in state).
This commit is contained in:
Joshua Boniface 2020-08-13 15:06:19 -04:00
parent 985ad5edc0
commit 2b4d980685
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-daemon/pvcapid/flaskapi.py
View File

@ -359,6 +359,10 @@ class API_Status(Resource):
type: string type: string
description: The overall cluster health description: The overall cluster health
example: Optimal example: Optimal
storage_health:
type: string
description: The overall storage cluster health
example: Optimal
primary_node: primary_node:
type: string type: string
description: The current primary coordinator node description: The current primary coordinator node

9
client-cli/cli_lib/cluster.py
View File

@ -92,10 +92,19 @@ def format_info(cluster_information, oformat):
else: else:
health_colour = ansiprint.yellow() health_colour = ansiprint.yellow()
if cluster_information['storage_health'] == 'Optimal':
storage_health_colour = ansiprint.green()
elif cluster_information['storage_health'] == 'Maintenance':
storage_health_colour = ansiprint.blue()
else:
storage_health_colour = ansiprint.yellow()
ainformation = [] ainformation = []
ainformation.append('{}PVC cluster status:{}'.format(ansiprint.bold(), ansiprint.end())) ainformation.append('{}PVC cluster status:{}'.format(ansiprint.bold(), ansiprint.end()))
ainformation.append('') ainformation.append('')
ainformation.append('{}Cluster health:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), health_colour, cluster_information['health'], ansiprint.end())) ainformation.append('{}Cluster health:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), health_colour, cluster_information['health'], ansiprint.end()))
ainformation.append('{}Storage health:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), storage_health_colour, cluster_information['storage_health'], ansiprint.end()))
ainformation.append('')
ainformation.append('{}Primary node:{} {}'.format(ansiprint.purple(), ansiprint.end(), cluster_information['primary_node'])) ainformation.append('{}Primary node:{} {}'.format(ansiprint.purple(), ansiprint.end(), cluster_information['primary_node']))
ainformation.append('{}Cluster upstream IP:{} {}'.format(ansiprint.purple(), ansiprint.end(), cluster_information['upstream_ip'])) ainformation.append('{}Cluster upstream IP:{} {}'.format(ansiprint.purple(), ansiprint.end(), cluster_information['upstream_ip']))
ainformation.append('') ainformation.append('')

10
daemon-common/cluster.py
View File

@ -127,6 +127,15 @@ def getClusterInformation(zk_conn):
else: else:
cluster_health = 'Optimal' cluster_health = 'Optimal'
# Find out our storage health from Ceph
ceph_health = zkhandler.readdata(zk_conn, '/ceph').split('\n')[2].split()[-1]
if maint_state == 'true':
storage_health = 'Maintenance'
elif ceph_health != 'HEALTH_OK':
storage_health = 'Degraded'
else:
storage_health = 'Optimal'
# State lists # State lists
node_state_combinations = [ node_state_combinations = [
'run,ready', 'run,flush', 'run,flushed', 'run,unflush', 'run,ready', 'run,flush', 'run,flushed', 'run,unflush',
@ -174,6 +183,7 @@ def getClusterInformation(zk_conn):
# Format the status data # Format the status data
cluster_information = { cluster_information = {
'health': cluster_health, 'health': cluster_health,
'storage_health': storage_health,
'primary_node': common.getPrimaryNode(zk_conn), 'primary_node': common.getPrimaryNode(zk_conn),
'upstream_ip': zkhandler.readdata(zk_conn, '/upstream_ip'), 'upstream_ip': zkhandler.readdata(zk_conn, '/upstream_ip'),
'nodes': formatted_node_states, 'nodes': formatted_node_states,