4 changed files with 42 additions and 89 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -4,7 +4,6 @@
    // Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
    "version": "0.2.0",
    "configurations": [
-    
        {
            "name": "Python: Aktuelle Datei",
            "type": "python",
@ -12,14 +11,6 @@
            "program": "${file}",
            "console": "integratedTerminal",
            "args": ["text"]
-        },
-        {
-            "name": "createToken with arguments",
-            "type": "python",
-            "request": "launch",
-            "program": "createToken.py",
-            "console": "integratedTerminal",
-            "args": ["PAAS","DynatraceInstaller","OPMAAS_123","Max_Mustermann@bmw.com","FG-8"]
        }
    ]
 }
--- a/createToken.py
+++ b/createToken.py
@ -5,11 +5,11 @@ import json
 import pandas as pd
 import sys

-#proxies=dict(http='socks5://localhost:3020', https='socks5://localhost:3020')
+proxies=dict(http='socks5://localhost:3020', https='socks5://localhost:3020')

-def get_request(url, headers):
+def get_request(url, headers, proxies):
    try:
-        response = requests.get(url, headers=headers)
+        response = requests.get(url, headers=headers, proxies=proxies)
        response.raise_for_status()
    except requests.exceptions.HTTPError as errh:
        return "An Http Error occurred:" + repr(errh)
@ -19,11 +19,12 @@ def get_request(url, headers):
        return "A Timeout Error occurred:" + repr(errt)
    except requests.exceptions.RequestException as err:
        return "An Unknown Error occurred" + repr(err)
+    
    return response

-def post_request(url, headers,body):
+def post_request(url, headers,body, proxies):
    try:
-        response = requests.post(url, body, headers=headers,verify=False)        
+        response = requests.post(url, body, headers=headers,verify=False, proxies=proxies)
        response.raise_for_status()
    except requests.exceptions.HTTPError as errh:
        return "An Http Error occurred:" + repr(errh)
@ -33,11 +34,12 @@ def post_request(url, headers,body):
        return "A Timeout Error occurred:" + repr(errt)
    except requests.exceptions.RequestException as err:
        return "An Unknown Error occurred" + repr(err)
+    
    return response

-def put_request(url, headers,body):
+def put_request(url, headers,body, proxies):
    try:
-        response = requests.put(url, body, headers=headers,verify=False)
+        response = requests.put(url, body, headers=headers,verify=False, proxies=proxies)
        response.raise_for_status()
    except requests.exceptions.HTTPError as errh:
        return "An Http Error occurred:" + repr(errh)
@ -47,96 +49,45 @@ def put_request(url, headers,body):
        return "A Timeout Error occurred:" + repr(errt)
    except requests.exceptions.RequestException as err:
        return "An Unknown Error occurred" + repr(err)
+    
    return response

-def CreateToken(DTAPIToken, DTENV,nwzone, dtEnvInfo, tokenname,scope):
+def CreateToken(DTAPIToken, DTENV,nwzone, dtEnvInfo, tokenname):
+   
   env = DTENV
   DTAPIToken = DTAPIToken
+     
+
   DTAPIURL = env + "/api/v2/apiTokens"
+
   headers = {
   'Content-Type': 'application/json',
   'Authorization': 'Api-Token ' + DTAPIToken
   }
-   DynatraceInstaller = [
-    "InstallerDownload",
-    "SupportAlert"
-   ]
-   DevOps_Read = [
-    "DataExport",  # Access problem and event feed, metrics, and topology.
-    "DTAQLAccess",  # User sessions.
-    "ReadSyntheticData",  # Read synthetic monitors, locations, and nodes.
-    "metrics.read",  # Read metrics.
-    "entities.read",  # Read entities.
-    "problems.read",  # Read problems.
-    "syntheticLocations.read",  # Read synthetic locations.
-    "slo.read",  # Read SLO.
-    "releases.read",  # Read releases.
-    "activeGates.read"
-   ]
-   ReadAll = [
-    "DataExport",  # Access problem and event feed, metrics, and topology.
-    "ReadConfig",  # Read configuration.
-    "DTAQLAccess",  # User sessions.
-    "ReadSyntheticData",  # Read synthetic monitors, locations, and nodes.
-    "auditLogs.read",  # Read audit logs.
-    "metrics.read",  # Read metrics.
-    "entities.read",  # Read entities.
-    "problems.read",  # Read problems.
-    "networkZones.read",  # Read network zones.
-    "activeGates.read",  # Read ActiveGates.
-    "credentialVault.read",  # Read credential vault entries.
-    "extensions.read",  # Read extensions.
-    "extensionConfigurations.read",  # Read extension monitoring configurations.
-    "extensionEnvironment.read",  # Read extension environment configurations.
-    "securityProblems.read",  # Read security problems.
-    "syntheticLocations.read",  # Read synthetic locations.
-    "slo.read",  # Read SLO.
-    "releases.read",  # Read releases.
-    "apiTokens.read"  # Read API tokens.
-   ]

-   temp=[]
-   if "DynatraceInstaller" in scope:
-        temp.extend(DynatraceInstaller)
-   if "DevOps_Read" in scope:
-        temp.extend(DevOps_Read)
-   if "ReadAll" in scope:
-        temp.extend(ReadAll)
+   
+   data = '{"name":"' + tokenname + '","scopes":["InstallerDownload","ReadConfig","WriteConfig","DataExport"]}'
+  #data = '{"name":"' + tokenname + '","scopes":["ReadConfig","DataExport","entities.read"]}'

-   if not temp: 
-    print("scope not supported")
-    sys.exit()
-
-   data = '{"name":"' + tokenname + '","scopes":["' + "\",\"".join(temp) + '"]}' #[""]       InstallerDownload",""
-   #data = '{"name":"' + tokenname + '","scopes":' + str(temp) + '}' #[""]
-
-   r = post_request(DTAPIURL,headers,data)
+   r = post_request(DTAPIURL,headers,data, proxies)
   print(r)
   row = {'Environment':dtEnvInfo,'DT_API_URL':env +"/api", 'DT_[API|PAAS]_TOKEN':r.json()['token'],'DT_NETWORK_ZONE':nwzone}
+   
   return row
-
 #################
 ##main
 #################
-print(sys.argv)
-if len(sys.argv) != 6:
-    print("createToken.py <TYPE> <SCOPE> <TICKET_NR> <email-address of requestor> <PURPOSE>\n")
-    print("TYPE: API, PAAS, APIPAAS")
-    print("SCOPE: DynatraceInstaller, DevOps_Read, ReadAll")
-    print("further details: https://atc.bmwgroup.net/confluence/display/OPMAAS/Token+Management")
-    sys.exit()
+
+if len(sys.argv) != 2:
+       print('createToken.py <filename>')
+       sys.exit()

 with open('./environment.yaml') as file:
   doc = yaml.safe_load(file)

 df = pd.DataFrame()
 #tokenname="runtime_AKS"
-type=sys.argv[1]
-scope=sys.argv[2]
-ticketnr=sys.argv[3]
-email=sys.argv[4].replace("_","-")
-purpose=sys.argv[5]
-tokenname=type+"_"+ticketnr+"_"+email+"_"+purpose
+tokenname=sys.argv[1]

 for item, doc in doc.items():
    token = dict(doc[2])
@ -149,9 +100,11 @@ for item, doc in doc.items():
        print("Gather data, hold on a minute")
        DTTOKEN = config(token.get('env-token-name'))
        DTURL = url.get('env-url')
-        row = CreateToken(DTTOKEN,DTURL,nwzone.get('network-zone'),dtEnvInfo.get('env-info'),tokenname,scope)
+
+        row = CreateToken(DTTOKEN,DTURL,nwzone.get('network-zone'),dtEnvInfo.get('env-info'),tokenname)
        df = df.append(row,ignore_index=True)        
+        
    else: 
        print("token not found, skipping " + item)
 print(df)
-df.to_excel(tokenname+".xlsx")
+df.to_excel(tokenname+".xlsx")
--- a/9
+++ b/9
@ -0,0 +1,9 @@
+NAPROD_TOKEN_VAR="<yourtoken>"
+EUPREPROD_TOKEN_VAR="<yourtoken>"    
+NAPREPROD_TOKEN_VAR="<yourtoken>"    
+CNPROD_TOKEN_VAR="<yourtoken>"  
+CNPREPROD_TOKEN_VAR="<yourtoken>"  
+GLOBAL_TOKEN_VAR="<yourtoken>"  
+TERRA_TOKEN_VAR="<yourtoken>"  
+
+REPORTING_FOLDER="./Reporting_CSV/"
--- a/environment.yaml
+++ b/environment.yaml
@ -22,15 +22,15 @@ naprod:
    - env-token-name: "NAPROD_TOKEN_VAR"
    - network-zone: "coco.na.aws.prod"
    - env-info: "E2E/PROD"
-cnprod:
+#cnprod:
    - name: "cnprod"
-    - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
+    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
    - env-token-name: "CNPROD_TOKEN_VAR"
    - network-zone: "coco.cn.aws-tsp.prod"
    - env-info: "E2E/PROD"
-cnpreprod:
+#cnpreprod:
    - name: "cnpreprod"
-    - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"
+    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
    - env-token-name: "CNPREPROD_TOKEN_VAR"
    - network-zone: "coco.cn.aws-tsp.preprod"
    - env-info: "DEV/INT"