From a4d13fb8cb51f7c4c01abcd2fea28d52591d1136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Pa=C3=9F?= <22845248+mpass99@users.noreply.github.com> Date: Tue, 21 Jun 2022 15:09:36 +0200 Subject: [PATCH] #148 Add stage to influx monitoring. --- configuration.example.yaml | 2 ++ deploy/ansible-deployment | 2 +- internal/config/config.go | 2 ++ pkg/monitoring/influxdb2_middleware.go | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configuration.example.yaml b/configuration.example.yaml index 5a07a29..6874f6c 100644 --- a/configuration.example.yaml +++ b/configuration.example.yaml @@ -81,3 +81,5 @@ influxdb: organization: PoseidonOrg # The influxdb bucket to store the data in. bucket: poseidon + # The stage to be sent with events. + # stage: staging diff --git a/deploy/ansible-deployment b/deploy/ansible-deployment index 1486220..421f591 160000 --- a/deploy/ansible-deployment +++ b/deploy/ansible-deployment @@ -1 +1 @@ -Subproject commit 14862204a4bdb8d2b52040a2c500bbe465f0c678 +Subproject commit 421f591bc148a7b1eb8d1e3ca1601ed4f941b52b diff --git a/internal/config/config.go b/internal/config/config.go index 720295d..335aa3a 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -58,6 +58,7 @@ var ( Token: "", Organization: "", Bucket: "", + Stage: "", }, } configurationFilePath = "./configuration.yaml" @@ -127,6 +128,7 @@ type InfluxDB struct { Token string Organization string Bucket string + Stage string } // configuration contains the complete configuration of Poseidon. diff --git a/pkg/monitoring/influxdb2_middleware.go b/pkg/monitoring/influxdb2_middleware.go index 1231281..9ee5af2 100644 --- a/pkg/monitoring/influxdb2_middleware.go +++ b/pkg/monitoring/influxdb2_middleware.go @@ -7,6 +7,7 @@ import ( influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2API "github.com/influxdata/influxdb-client-go/v2/api" "github.com/influxdata/influxdb-client-go/v2/api/write" + "github.com/openHPI/poseidon/internal/config" "github.com/openHPI/poseidon/internal/environment" "github.com/openHPI/poseidon/internal/runner" "github.com/openHPI/poseidon/pkg/dto" @@ -41,6 +42,7 @@ func InfluxDB2Middleware(influxClient influxdb2API.WriteAPI, manager environment return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { route := mux.CurrentRoute(r).GetName() p := influxdb2.NewPointWithMeasurement(influxdbMeasurementPrefix + route) + p.AddTag("stage", config.Config.InfluxDB.Stage) start := time.Now().UTC() p.SetTime(time.Now())