munin: update wcs counts for tenants/ subdirectory
This commit is contained in:
parent
f0fec15824
commit
9a806d04fc
|
@ -35,9 +35,12 @@ for tenant in itertools.chain(os.listdir(base_dir), os.listdir(os.path.join(base
|
|||
continue
|
||||
if tenant.endswith('.invalid'):
|
||||
continue
|
||||
if not os.path.isdir(os.path.join(base_dir, tenant)):
|
||||
dirname = os.path.join(base_dir, tenant)
|
||||
if not os.path.exists(dirname):
|
||||
dirname = os.path.join(base_dir, 'tenants', tenant)
|
||||
if not os.path.isdir(dirname):
|
||||
continue
|
||||
cfg = pickle.load(open(os.path.join(base_dir, tenant, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
cfg = pickle.load(open(os.path.join(dirname, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
if 'postgresql' not in cfg:
|
||||
continue
|
||||
psql_cfg = {}
|
||||
|
|
|
@ -35,7 +35,12 @@ total_logged_user_count.label Front by logged user
|
|||
for tenant_dir in itertools.chain(os.listdir(base_dir), os.listdir(os.path.join(base_dir, 'tenants'))):
|
||||
if tenant_dir != tenant:
|
||||
continue
|
||||
cfg = pickle.load(open(os.path.join(base_dir, tenant, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
dirname = os.path.join(base_dir, tenant)
|
||||
if not os.path.exists(dirname):
|
||||
dirname = os.path.join(base_dir, 'tenants', tenant)
|
||||
if not os.path.isdir(dirname):
|
||||
continue
|
||||
cfg = pickle.load(open(os.path.join(dirname, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
if 'postgresql' not in cfg:
|
||||
continue
|
||||
psql_cfg = {}
|
||||
|
|
|
@ -44,9 +44,12 @@ for tenant in itertools.chain(os.listdir(base_dir), os.listdir(os.path.join(base
|
|||
continue
|
||||
if tenant.endswith('.invalid'):
|
||||
continue
|
||||
if not os.path.isdir(os.path.join(base_dir, tenant)):
|
||||
dirname = os.path.join(base_dir, tenant)
|
||||
if not os.path.exists(dirname):
|
||||
dirname = os.path.join(base_dir, 'tenants', tenant)
|
||||
if not os.path.isdir(dirname):
|
||||
continue
|
||||
cfg = pickle.load(open(os.path.join(base_dir, tenant, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
cfg = pickle.load(open(os.path.join(dirname, 'config.pck'), 'rb'), encoding='utf-8')
|
||||
if 'postgresql' not in cfg:
|
||||
continue
|
||||
psql_cfg = {}
|
||||
|
|
Loading…
Reference in New Issue