From 69aaaaf69b8e987974817da46f55233ea84ffabd Mon Sep 17 00:00:00 2001 From: Justin Paul Date: Thu, 23 Mar 2023 11:37:29 -0400 Subject: [PATCH] app code update added default site name and id --- app/python-node-exporter.py | 6 +++--- app/vrametrics | 22 ++++++++++++++++++++++ app/vrametrics.txt | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 app/vrametrics create mode 100644 app/vrametrics.txt diff --git a/app/python-node-exporter.py b/app/python-node-exporter.py index 750dbca..3034244 100644 --- a/app/python-node-exporter.py +++ b/app/python-node-exporter.py @@ -44,8 +44,8 @@ log.debug("Running with Variables:\nVerify SSL: " + str(verifySSL) + "\nZVM Host # Global Variables token = "" -siteId = "" -siteName = "" +siteId = "NotSet" +siteName = "NotSet" lastStats = CaseInsensitiveDict() # Authentication Thread which handles authentication and token refresh for ZVM API @@ -628,7 +628,7 @@ def start_thread(target_func): return thread # start the threads -probe_thread = start_thread(ThreadProbe) + auth_thread = start_thread(ZvmAuthHandler) data_thread = start_thread(GetDataFunc) stats_thread = start_thread(GetStatsFunc) diff --git a/app/vrametrics b/app/vrametrics new file mode 100644 index 0000000..8dfe0e7 --- /dev/null +++ b/app/vrametrics @@ -0,0 +1,22 @@ +vra_memory_in_GB{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_vcpu_count{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 2 +vra_protected_vms{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_protected_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_protected_volumes{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 23 +vra_recovery_vms{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 6 +vra_recovery_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_recovery_volumes{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 9 +vra_self_protected_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 2 +vra_cpu_usage_mhz{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 131 +vra_memory_usage_mb{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 153 +vra_memory_in_GB{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 16 +vra_vcpu_count{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_vms{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_volumes{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_recovery_vms{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_recovery_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_recovery_volumes{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 19 +vra_self_protected_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 0 +vra_cpu_usage_mhz{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 153 +vra_memory_usage_mb{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 327 diff --git a/app/vrametrics.txt b/app/vrametrics.txt new file mode 100644 index 0000000..8dfe0e7 --- /dev/null +++ b/app/vrametrics.txt @@ -0,0 +1,22 @@ +vra_memory_in_GB{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_vcpu_count{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 2 +vra_protected_vms{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_protected_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_protected_volumes{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 23 +vra_recovery_vms{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 6 +vra_recovery_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_recovery_volumes{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 9 +vra_self_protected_vpgs{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 2 +vra_cpu_usage_mhz{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 131 +vra_memory_usage_mb{VraIdentifierStr="6443043516611716227",VraName="Z-VRA-192.168.50.51",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 153 +vra_memory_in_GB{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 16 +vra_vcpu_count{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_vms{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 4 +vra_protected_volumes{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 5 +vra_recovery_vms{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_recovery_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 3 +vra_recovery_volumes{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 19 +vra_self_protected_vpgs{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 0 +vra_cpu_usage_mhz{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 153 +vra_memory_usage_mb{VraIdentifierStr="6443043516611716232",VraName="Z-VRA-192.168.50.52",VraVersion="9.7.20",HostVersion="7.0",SiteIdentifier="abb48927-1f8d-43e9-94ee-202954d18adb",SiteName="JP Lab 1"} 327