diff --git a/templates/definition/tariff/enever.yaml b/templates/definition/tariff/enever.yaml index 2694cfd66..366bc4580 100644 --- a/templates/definition/tariff/enever.yaml +++ b/templates/definition/tariff/enever.yaml @@ -51,8 +51,7 @@ render: | source: http uri: https://enever.nl/api/stroomprijs_vandaag.php?token={{ .token }} jq: | - .data | [ - .[] | + [ .data.[] | { "start": .datum | strptime("%F %T") | strflocaltime("%FT%T%:z"), "end": .datum | strptime("%F %T") | strflocaltime("%FT%T%:z") | strptime("%FT%T%z") | mktime + 3600 | strflocaltime("%FT%T%:z"), @@ -65,8 +64,7 @@ render: | source: http uri: https://enever.nl/api/stroomprijs_morgen.php?token={{ .token }} jq: | - .data | [ - .[] | + [ .data.[] | { "start": .datum | strptime("%F %T") | strflocaltime("%FT%T%:z"), "end": .datum | strptime("%F %T") | strflocaltime("%FT%T%:z") | strptime("%FT%T%z") | mktime + 3600 | strflocaltime("%FT%T%:z"), diff --git a/templates/definition/tariff/gruenstromindex.yaml b/templates/definition/tariff/gruenstromindex.yaml index 6614f9752..5bf4fd713 100644 --- a/templates/definition/tariff/gruenstromindex.yaml +++ b/templates/definition/tariff/gruenstromindex.yaml @@ -20,4 +20,9 @@ render: | forecast: source: http uri: https://api.corrently.io/v2.0/gsi/prediction?zip={{ .zip }}&token={{ .token }} - jq: '[.forecast[] | {start: .timeframe.start / 1e3 | todate, end: .timeframe.end / 1e3 | todate, price: .co2_g_standard}] | tostring' + jq: | + [ .forecast[] | { + start: .timeframe.start / 1000 | todate, + end: .timeframe.end / 1000 | todate, + price: .co2_g_standard + } ] | tostring diff --git a/templates/definition/tariff/nordpool.yaml b/templates/definition/tariff/nordpool.yaml index 698aedd5e..7490ab331 100644 --- a/templates/definition/tariff/nordpool.yaml +++ b/templates/definition/tariff/nordpool.yaml @@ -56,8 +56,7 @@ render: | source: http uri: https://dataportal-api.nordpoolgroup.com/api/DayAheadPrices?market=DayAhead&date={{ `{{ now.Local | date "2006-01-02" }}` }}&deliveryArea={{ .region }}¤cy={{ .currency }} jq: | - .multiAreaEntries | [ - .[] | + [ .multiAreaEntries.[] | { "start": .deliveryStart, "end": .deliveryEnd, @@ -71,8 +70,7 @@ render: | uri: https://dataportal-api.nordpoolgroup.com/api/DayAheadPrices?market=DayAhead&date={{ `{{ addDate (now.Local) 0 0 1 | date "2006-01-02" }}` }}&deliveryArea={{ .region }}¤cy={{ .currency }} allowempty: true jq: | - .multiAreaEntries | [ - .[] | + [ .multiAreaEntries.[] | { "start": .deliveryStart, "end": .deliveryEnd,