update azure-collector fix None type issue

Author: red0sena

collector/spot-dataset/azure/lambda/current_collector/load_price.py

@@ -137,6 +137,6 @@ def collect_price_with_multithreading():
 
     price_df = pd.DataFrame(price_list)
     savings_df = preprocessing_price(price_df)
-    savings_df = savings_df.drop_duplicates(subset=['InstanceTier', 'InstanceType', 'Region'], keep='first', inplace=True)
+    savings_df = savings_df.drop_duplicates(subset=['InstanceTier', 'InstanceType', 'Region'], keep='first')
 
     return savings_df

collector/spot-dataset/azure/lambda/current_collector/upload_data.py

@@ -142,8 +142,8 @@ def query_selector(data):
 
 
 def upload_cloudwatch(data, timestamp):
-    ondemand_count = len(data.drop(columns=['SpotPrice', 'Savings']).dropna())
-    spot_count = len(data.drop(columns=['OndemandPrice', 'Savings']).dropna())
+    ondemand_count = len(data.drop(columns=['IF', 'SpotPrice', 'Savings']).dropna())
+    spot_count = len(data.drop(columns=['IF', 'OndemandPrice', 'Savings']).dropna())
     if_count = len(data.drop(columns=['OndemandPrice', 'SpotPrice', 'Savings']).dropna())
 
     cw_client = boto3.client('logs')

const_config.py

@@ -5,13 +5,15 @@ def func_set(self, value):
 
     def func_get(self):
         return func()
+
     return property(func_get, func_set)
 
+
 class Storage(object):
     @constant
     def BUCKET_NAME():
         return "spotlake"
-    
+
     @constant
     def DATABASE_NAME():
         return "spotlake"
@@ -28,6 +30,7 @@ def AZURE_TABLE_NAME():
     def GCP_TABLE_NAME():
         return "gcp"
 
+
 class AwsCollector(object):
     @constant
     def LOCAL_PATH():
@@ -45,6 +48,7 @@ def S3_LOCAL_FILES_SAVE_PATH():
     def S3_WORKLOAD_SAVE_PATH():
         return "rawdata/aws/workloads"
 
+
 class AzureCollector(object):
     @constant
     def SLACK_WEBHOOK_URL():
@@ -57,7 +61,7 @@ def GET_EVICTION_RATE_URL():
     @constant
     def GET_HARDWAREMAP_URL():
         return "https://afd.hosting.portal.azure.net/compute/?environmentjson=true&extensionName=Microsoft_Azure_Compute&l=en&trustedAuthority=portal.azure.com"
-    
+
     @constant
     def GET_PRICE_URL():
         return "https://s2.billing.ext.azure.com/api/Billing/Subscription/GetSpecsCosts?SpotPricing=true"
@@ -71,17 +75,17 @@ def SPEC_RESOURCE_SETS_LIMIT():
         return 2000
 
     @constant
-    def LATEST_FILENAME ():
+    def LATEST_FILENAME():
         return "latest_azure.json"
 
     @constant
     def S3_LATEST_DATA_SAVE_PATH():
         return "latest_data/latest_azure.json"
-    
+
     @constant
     def QUERY_SELECTOR_FILENAME():
         return "query-selector-azure.json"
-    
+
     @constant
     def S3_QUERY_SELECTOR_SAVE_PATH():
         return "query-selector/query-selector-azure.json"
@@ -105,11 +109,11 @@ def SERVER_SAVE_FILENAME():
     @constant
     def GET_PRICE_URL():
         return "https://prices.azure.com:443/api/retail/prices?$filter=serviceName eq 'Virtual Machines' and priceType eq 'Consumption' and unitOfMeasure eq '1 Hour' and  contains(productName, 'Windows') eq false and contains(meterName, 'Low Priority') eq false  and contains(meterName, 'Expired') eq false and contains(location, 'Gov') eq false and contains(location, 'ATT') eq false &$skip="
-    
+
     @constant
     def FILTER_LOCATIONS():
         return ['GOV', 'EUAP', 'ATT', 'SLV', '']
-    
+
     @constant
     def MAX_SKIP():
         return 200
@@ -122,6 +126,7 @@ def SPOT_DATA_COLLECTION_LOG_GROUP_NAME():
     def LOG_STREAM_NAME():
         return "Azure-Count"
 
+
 class GcpCollector(object):
     @constant
     def API_LINK():
@@ -134,11 +139,11 @@ def S3_LATEST_DATA_SAVE_PATH():
     @constant
     def LOCAL_PATH():
         return "/tmp"
-    
+
     @constant
     def SPOT_DATA_COLLECTION_LOG_GROUP_NAME():
         return "Collection-Data-Count"
-    
+
     @constant
     def LOG_STREAM_NAME():
-        return "GCP-Count"
+        return "GCP-Count"