From 49c973707f58dbfd578a1d61a99ad2a4b6943e1c Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 23 Dec 2020 07:40:52 +0200 Subject: [PATCH] make encname an env var --- prom.py | 5 ++--- prom_servers.py | 2 +- scraperMain.py | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/prom.py b/prom.py index 6a6b18a..46317fd 100644 --- a/prom.py +++ b/prom.py @@ -15,9 +15,8 @@ import os # for ENV arguments import scraperMain, prom_servers -enc = 'k-space-blade-02' # for now ~~hard~~softcoded in, we'd need to add parsing in hostnames, and add a similar enc env var. - hostname = str(os.environ['SSH_HOSTNAME']) +encname = str(os.environ['ENC_NAME']) sshkeypath = os.getenv('SSH_KEYPATH','/bss/.ssh/id_rsa') PREFIX = os.getenv('PREFIX','bladetest_') @@ -25,7 +24,7 @@ PREFIX = os.getenv('PREFIX','bladetest_') app = Flask(__name__) @app.route('/', methods=['GET']) def parse_request(): # If somebody accesses us - data = scraperMain.scraperMain(hostname, enc, sshkeypath) # Gather up, we're going to wait a few minutes on the data. + data = scraperMain.scraperMain(hostname, encname, sshkeypath) # Gather up, we're going to wait a few minutes on the data. #with open("prom_servers.out", "a") as f: # DO NOT UNCOMMENT IN PROD # print(data, file=f) diff --git a/prom_servers.py b/prom_servers.py index b54e514..e855bf9 100644 --- a/prom_servers.py +++ b/prom_servers.py @@ -102,7 +102,7 @@ def prom_servers(PREFIX, baysInUseCount, servers): #PREFIX = 'bladetest_' #baysInUseCount = 11 # 0~ 1~ 2~ 3~ 4~ 5~ 6~ 7~ 8~ -# [BayNumber "Server Name", "Serial Number", "Status", "Power", "UID Partner", presentPowerDirectDC, relativeUsageAC, "enc"] +# [BayNumber "Server Name", "Serial Number", "Status", "Power", "UID Partner", presentPowerDirectDC, relativeUsageAC, "encname"] #servers = [[1, 'foo-lab-1', '', 'OK', 'On', 'Off', 142, 222, "k-space-blade-02"], [2, 'foo-lab-2', 'CZ302243P9', 'OK', 'On', 'Off', 87, 136, "k-space-blade-02"], [3, 'foo-lab-3', 'CZJI441OKP', 'Failed', 'On', 'Off', 127, 198, "k-space-blade-02"], [4, 'kspve1', 'CZJ18450FK', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"], [5, 'kspve2-2', '', 'OK', 'On', 'Off', 71, 111, "k-space-blade-02"], [6, 'kspve3', '', 'OK', 'On', 'Off', 80, 125, "k-space-blade-02"], [7, 'foo-blade', '', 'OK', 'On', 'Off', 81, 127, "k-space-blade-02"], [8, 'Bar-01', 'CZ241274CC', 'OK', 'On', 'Off', 126, 197, "k-space-blade-02"], [9, 'baz-sar', 'CZ3217FNYE', 'OK', 'On', 'Off', 129, 202, "k-space-blade-02"], [10, 'baz-sar2', 'CZ3217FFSS', 'OK', 'On', 'Off', 97, 152, "k-space-blade-02"], [12, 'bee-bar', '', 'OK', 'On', 'Off', 86, 134, "k-space-blade-02"]] #print(prom_servers(PREFIX, baysInUseCount, servers)) diff --git a/scraperMain.py b/scraperMain.py index d6c44e8..521611d 100644 --- a/scraperMain.py +++ b/scraperMain.py @@ -49,13 +49,13 @@ def ssh_runcmd(command): # Some abstraction to run ssh commands. #cmdout = '\n'.join(cmdout) # DO NOT UNCOMMENT THIS, HERE FOR ONLY REFERENCE TO JOIN THE LINES BACK. return(cmdout) # Return list of output stuff. -def scraperMain(hostname, enc, sshkeypath): +def scraperMain(hostname, encname, sshkeypath): global channel # needed for ssh_runcmd # Input validation if not type(hostname) is str: raise TypeError("scraperMain: hostname must be a string, '" + str(hostname) + "' is not.") - if not type(enc) is str: - raise TypeError("scraperMain: enc must be a string, '" + str(enc) + "' is not.") + if not type(encname) is str: + raise TypeError("scraperMain: enc must be a string, '" + str(encname) + "' is not.") if not type(sshkeypath) is str: raise TypeError("scraperMain: sshkeypath must be a string, '" + str(sshkeypath) + "' is not.") @@ -125,7 +125,7 @@ def scraperMain(hostname, enc, sshkeypath): # Fields: [BayNumber "Server Name", "Serial Number", "Status", "Power", "UID Partner", presentPowerDirectDC, relativeUsageAC] for n in range(baysInUseCount): - servers[n].append( enc ) # Add what enc was used. + servers[n].append( encname ) # Add what enc was used. # Fields: [BayNumber "Server Name", "Serial Number", "Status", "Power", "UID Partner", presentPowerDirectDC, relativeUsageAC, "enc"] return(baysInUseCount, servers) # we could return more, but nobody wants our data :/