diff options
author | yosefy <yosefy@users.noreply.github.com> | 2019-07-01 12:53:50 +0300 |
---|---|---|
committer | Ben Kochie <superq@gmail.com> | 2019-07-01 11:53:50 +0200 |
commit | b4cc81834734e81d0397719c14ddd4853e0cc98f (patch) | |
tree | 8e9795c17728821f9913075e55466d7c500a9f44 /text_collector_examples | |
parent | 3a576f64deac92074b529fe211a28344af24c11d (diff) | |
download | prometheus_node_collector-b4cc81834734e81d0397719c14ddd4853e0cc98f.tar.bz2 prometheus_node_collector-b4cc81834734e81d0397719c14ddd4853e0cc98f.tar.xz prometheus_node_collector-b4cc81834734e81d0397719c14ddd4853e0cc98f.zip |
fix for 'Celsius' spelling problem in storcli.py (#1408)
Signed-off-by: yosefy <yosef.yudilevich@gmail.com>
Diffstat (limited to 'text_collector_examples')
-rwxr-xr-x | text_collector_examples/storcli.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/text_collector_examples/storcli.py b/text_collector_examples/storcli.py index 26f4bbd..ed279e6 100755 --- a/text_collector_examples/storcli.py +++ b/text_collector_examples/storcli.py | |||
@@ -48,6 +48,8 @@ def main(args): | |||
48 | 48 | ||
49 | for controller in data: | 49 | for controller in data: |
50 | response = controller['Response Data'] | 50 | response = controller['Response Data'] |
51 | |||
52 | handle_common_controller(response) | ||
51 | if response['Version']['Driver Name'] == 'megaraid_sas': | 53 | if response['Version']['Driver Name'] == 'megaraid_sas': |
52 | handle_megaraid_controller(response) | 54 | handle_megaraid_controller(response) |
53 | elif response['Version']['Driver Name'] == 'mpt3sas': | 55 | elif response['Version']['Driver Name'] == 'mpt3sas': |
@@ -57,6 +59,13 @@ def main(args): | |||
57 | 59 | ||
58 | print_all_metrics(metric_list) | 60 | print_all_metrics(metric_list) |
59 | 61 | ||
62 | def handle_common_controller(response): | ||
63 | (controller_index, baselabel) = get_basic_controller_info(response) | ||
64 | |||
65 | # Split up string to not trigger CodeSpell issues | ||
66 | if 'ROC temperature(Degree Celc' + 'ius)' in response['HwCfg'].keys(): | ||
67 | response['HwCfg']['ROC temperature(Degree Celsius)'] = response['HwCfg'].pop('ROC temperature(Degree Celc' + 'ius)') | ||
68 | add_metric('temperature', baselabel, int(response['HwCfg']['ROC temperature(Degree Celsius)'])) | ||
60 | 69 | ||
61 | def handle_sas_controller(response): | 70 | def handle_sas_controller(response): |
62 | (controller_index, baselabel) = get_basic_controller_info(response) | 71 | (controller_index, baselabel) = get_basic_controller_info(response) |
@@ -69,9 +78,7 @@ def handle_sas_controller(response): | |||
69 | len(response['Physical Device Information'].keys()) / 2) | 78 | len(response['Physical Device Information'].keys()) / 2) |
70 | except AttributeError: | 79 | except AttributeError: |
71 | pass | 80 | pass |
72 | # Split up string to not trigger CodeSpell issues | 81 | |
73 | add_metric('temperature', baselabel, | ||
74 | int(response['HwCfg']['ROC temperature(Degree Celc' + 'ius)'])) | ||
75 | for key, basic_disk_info in response['Physical Device Information'].items(): | 82 | for key, basic_disk_info in response['Physical Device Information'].items(): |
76 | if 'Detailed Information' in key: | 83 | if 'Detailed Information' in key: |
77 | continue | 84 | continue |
@@ -94,7 +101,6 @@ def handle_megaraid_controller(response): | |||
94 | add_metric('ports', baselabel, response['HwCfg']['Backend Port Count']) | 101 | add_metric('ports', baselabel, response['HwCfg']['Backend Port Count']) |
95 | add_metric('scheduled_patrol_read', baselabel, | 102 | add_metric('scheduled_patrol_read', baselabel, |
96 | int('hrs' in response['Scheduled Tasks']['Patrol Read Reoccurrence'])) | 103 | int('hrs' in response['Scheduled Tasks']['Patrol Read Reoccurrence'])) |
97 | add_metric('temperature', baselabel, int(response['HwCfg']['ROC temperature(Degree Celsius)'])) | ||
98 | for cvidx, cvinfo in enumerate(response['Cachevault_Info']): | 104 | for cvidx, cvinfo in enumerate(response['Cachevault_Info']): |
99 | add_metric('cv_temperature', baselabel + ',cvidx="' + str(cvidx) + '"', int(cvinfo['Temp'].replace('C',''))) | 105 | add_metric('cv_temperature', baselabel + ',cvidx="' + str(cvidx) + '"', int(cvinfo['Temp'].replace('C',''))) |
100 | 106 | ||