From bce8a48cade7a915e00381d869beaf6eece4794f Mon Sep 17 00:00:00 2001 From: benbierens Date: Sun, 13 Aug 2023 10:07:47 +0200 Subject: [PATCH] logs grafana image id --- CodexNetDeployer/Program.cs | 3 ++- DistTestCore/TestLifecycle.cs | 3 ++- KubernetesWorkflow/PodLabels.cs | 1 + Logging/ApplicationIds.cs | 4 +++- Logging/StatusLog.cs | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CodexNetDeployer/Program.cs b/CodexNetDeployer/Program.cs index 9c1ecbf..da18e01 100644 --- a/CodexNetDeployer/Program.cs +++ b/CodexNetDeployer/Program.cs @@ -30,7 +30,8 @@ public class Program $"\tCodex image: '{new CodexContainerRecipe().Image}'" + nl + $"\tCodexContracts image: '{new CodexContractsContainerRecipe().Image}'" + nl + $"\tPrometheus image: '{new PrometheusContainerRecipe().Image}'" + nl + - $"\tGeth image: '{new GethContainerRecipe().Image}'" + nl); + $"\tGeth image: '{new GethContainerRecipe().Image}'" + nl + + $"\tGrafana image: '{new GrafanaContainerRecipe().Image}'" + nl); if (!args.Any(a => a == "-y")) { diff --git a/DistTestCore/TestLifecycle.cs b/DistTestCore/TestLifecycle.cs index 0958898..260e438 100644 --- a/DistTestCore/TestLifecycle.cs +++ b/DistTestCore/TestLifecycle.cs @@ -78,7 +78,8 @@ namespace DistTestCore codexId: GetCodexId(), gethId: new GethContainerRecipe().Image, prometheusId: new PrometheusContainerRecipe().Image, - codexContractsId: new CodexContractsContainerRecipe().Image + codexContractsId: new CodexContractsContainerRecipe().Image, + grafanaId: new GrafanaContainerRecipe().Image ); } diff --git a/KubernetesWorkflow/PodLabels.cs b/KubernetesWorkflow/PodLabels.cs index 60fc332..85b3a98 100644 --- a/KubernetesWorkflow/PodLabels.cs +++ b/KubernetesWorkflow/PodLabels.cs @@ -25,6 +25,7 @@ namespace KubernetesWorkflow Add("gethid", applicationIds.GethId); Add("prometheusid", applicationIds.PrometheusId); Add("codexcontractsid", applicationIds.CodexContractsId); + Add("grafanaid", applicationIds.GrafanaId); } public PodLabels GetLabelsForAppName(string appName) diff --git a/Logging/ApplicationIds.cs b/Logging/ApplicationIds.cs index d52dc10..7162a36 100644 --- a/Logging/ApplicationIds.cs +++ b/Logging/ApplicationIds.cs @@ -2,17 +2,19 @@ { public class ApplicationIds { - public ApplicationIds(string codexId, string gethId, string prometheusId, string codexContractsId) + public ApplicationIds(string codexId, string gethId, string prometheusId, string codexContractsId, string grafanaId) { CodexId = codexId; GethId = gethId; PrometheusId = prometheusId; CodexContractsId = codexContractsId; + GrafanaId = grafanaId; } public string CodexId { get; } public string GethId { get; } public string PrometheusId { get; } public string CodexContractsId { get; } + public string GrafanaId { get; } } } diff --git a/Logging/StatusLog.cs b/Logging/StatusLog.cs index 96a8cc2..f5d5831 100644 --- a/Logging/StatusLog.cs +++ b/Logging/StatusLog.cs @@ -26,6 +26,7 @@ namespace Logging gethid = applicationIds.GethId, prometheusid = applicationIds.PrometheusId, codexcontractsid = applicationIds.CodexContractsId, + grafanaid = applicationIds.GrafanaId, category = NameUtils.GetCategoryName(), fixturename = fixtureName, testname = NameUtils.GetTestMethodName(), @@ -59,6 +60,7 @@ namespace Logging public string gethid { get; set; } = string.Empty; public string prometheusid { get; set; } = string.Empty; public string codexcontractsid { get; set; } = string.Empty; + public string grafanaid { get; set; } = string.Empty; public string category { get; set; } = string.Empty; public string fixturename { get; set; } = string.Empty; public string testname { get; set; } = string.Empty;