telegraf advanced tempalte working

3 files changed, 58 insertions, 31 deletions

diff --git a/modules/telegraf/core.py b/modules/telegraf/core.py
index ded2d1d..347bdba 100644
--- a/modules/telegraf/core.py
+++ b/modules/telegraf/core.py
@@ -25,7 +25,7 @@ def introduction():
 ###########################
 
 
-def modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, measurement_name):
+def modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, measurement_name, api_username, api_password, template_name):
 
     ## Pipeline interval
     telegraf_utils.modify_agent(new_pipeline_path,"interval", schedulingPeriod)
@@ -36,15 +36,36 @@ def modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, m
     ### Pluggins
     fields=[]
     json_query = ""
-    for key, value in data_values.items():
-        fields.append(key)
 
-        parts = value.rsplit('.', 2)
-        json_query = '.'.join(parts[:-1])[1:] # Get the json path till last item (second last dot(.))
+    if template_name == "basic_ETL.toml":
 
-    telegraf_utils.modify_input(new_pipeline_path,"json_query", json_query)
-    telegraf_utils.modify_input(new_pipeline_path,"fieldinclude", fields)
+        for key, value in data_values.items():
+            fields.append(key)
 
+            parts = value.rsplit('.', 2)
+            json_query = '.'.join(parts[:-1])[1:] # Get the json path till last item (second last dot(.))
+
+
+        telegraf_utils.modify_input(new_pipeline_path,"json_query", json_query)
+        telegraf_utils.modify_input(new_pipeline_path,"fieldinclude", fields)
+
+    elif template_name == "advanced_ETL.toml":
+
+        for key, value in data_values.items():
+
+            parts = value.split(']', 1)
+            json_query = parts[0].split("[")[0][1:]
+            fields.append(parts[1][1:])
+
+
+
+        telegraf_utils.modify_input(new_pipeline_path,"json_query", json_query)
+        telegraf_utils.modify_input(new_pipeline_path,"json_string_fields", fields)
+
+
+
+
+    ## Measurement
     telegraf_utils.modify_input(new_pipeline_path,"name_override", measurement_name)
 
     ## Database
@@ -54,6 +75,13 @@ def modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, m
     telegraf_utils.modify_output(new_pipeline_path, "password", config.DB_PASS)
 
 
+    ## If authenctication needed
+    if api_username and api_username.lower() != "placeholder":
+        print("Added username ")
+        telegraf_utils.modify_input(new_pipeline_path,"username", api_username)
+        print("Added password")
+        telegraf_utils.modify_input(new_pipeline_path,"password", api_password)
+
 
 
 
@@ -62,8 +90,8 @@ def build_pipeline():
         data_values, api_url, api_username, api_password= common.get_data_values()
 
         print("\nKui tihti peaks andmekonveier jooksma? (sekundites)")
-        schedulingPeriod = str(common.ask_digit_input(86400))+ "sec"
-        measurement_name = str(input("Palun sisesta andmebaasi jaoks vajalik 'measurement' nimi (influxDB): "))
+        schedulingPeriod = str(common.ask_digit_input(86400))+ "s"
+        measurement_name = str(input("Palun sisesta andmebaasi (influxDB) jaoks vajalik 'measurement' nimi: "))
         new_pipeline_name=input("Mis saab andmekonveieri nimeks: ")+".toml"
 
     ## TODO
@@ -81,13 +109,17 @@ def build_pipeline():
 
     ### Select template 
     ##TODO
-    template_name="basic_ETL.toml"
+    #template_name="basic_ETL.toml"
+    if (api_username and api_username.lower() != "placeholder") and (api_password and api_password.lower() != "placeholder"):
+        template_name="advanced_ETL.toml"
+    else:
+        template_name="basic_ETL.toml"
 
     new_pipeline_path = f"pipelines/{new_pipeline_name}"
     shutil.copy(f"modules/telegraf/templates/{template_name}", new_pipeline_path)
 
 
-    modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, measurement_name)
+    modify_template(new_pipeline_path, api_url, schedulingPeriod, data_values, measurement_name, api_username, api_password, template_name)
 
 
 
diff --git a/modules/telegraf/templates/advanced_ETL.toml b/modules/telegraf/templates/advanced_ETL.toml
index de6b8e1..217fb8f 100644
--- a/modules/telegraf/templates/advanced_ETL.toml
+++ b/modules/telegraf/templates/advanced_ETL.toml
@@ -1,39 +1,34 @@
+# Telegraf Configuration
 [agent]
+  interval = "10s" # Fetch data every 10 seconds
   debug = true
-#  interval = "3600s" 
-
 
 #INPUT: fetching data from delta api
 [[inputs.http]]
-  name_override = "telegraafi_deltaEnergy"
-  urls = ["https://delta.iot.cs.ut.ee/measurement/measurements?source=780&dateFrom=2025-02-19T00:00:00Z&dateTo=2025-02-19T23:59:59Z&pageSize=200&type=KogEN"]
-  
+  urls = []
   method = "GET"
+  timeout = "5s"
+  headers = { Content-Type = "application/json" }
+  data_format = "json"
   
   # Authentication
   username = "rasmus.luha"
-  password = 
+  password = "Placeholder"
 
   # Response format
-  data_format = "json"
+  #data_format = "json"
 
   # Specify JSON field
-  json_query = "measurements"  
-
-  # Field for energy value from "measurements"
-  json_string_fields = ["KogEN.T.value"]
-
-  # Timestamp configuration - needed for the database
-  json_time_key = "time"
-  json_time_format = "2006-01-02T15:04:05Z"
-
+  json_query = "placeholder"  
+  json_string_fields = []
 
+  name_override = "Placeholder"  #"weather_metrics"
 
 
 # OUTPUT: Write data to InfluxDB
 [[outputs.influxdb]]
   urls = ["http://influxdb:8086"]
-  database = "telegraf_deltaEnergy"
-  username = "admin"
-  password = "admin"
+  database = "placeholder "#"telegraf_deltaEnergy"
+  username = "TODO"
+  password = "TODO"
 
diff --git a/modules/telegraf/templates/basic_ETL.toml b/modules/telegraf/templates/basic_ETL.toml
index 82b1728..5af3c95 100644
--- a/modules/telegraf/templates/basic_ETL.toml
+++ b/modules/telegraf/templates/basic_ETL.toml
@@ -15,7 +15,7 @@
   #tag_keys = ["temperature", "windspeed"]
 
   # Measuremens for DB
-  name_override = "plcaeholder"  #"weather_metrics"
+  name_override = "Placeholder"  #"weather_metrics"
 
 
 # Output Plugin: InfluxDB