From fc3f424208b2c1cde9207cb353c2b22caf14c2f9 Mon Sep 17 00:00:00 2001 From: benbierens Date: Sun, 13 Aug 2023 08:40:32 +0200 Subject: [PATCH] Splits up grafana starter --- DistTestCore/GrafanaStarter.cs | 113 ++++++++++++++++++++++++++++++ DistTestCore/PrometheusStarter.cs | 79 --------------------- DistTestCore/TestLifecycle.cs | 2 + 3 files changed, 115 insertions(+), 79 deletions(-) create mode 100644 DistTestCore/GrafanaStarter.cs diff --git a/DistTestCore/GrafanaStarter.cs b/DistTestCore/GrafanaStarter.cs new file mode 100644 index 0000000..b3ce38a --- /dev/null +++ b/DistTestCore/GrafanaStarter.cs @@ -0,0 +1,113 @@ +using DistTestCore.Metrics; +using KubernetesWorkflow; +using Logging; +using Newtonsoft.Json; +using System.Reflection; + +namespace DistTestCore +{ + public class GrafanaStarter : BaseStarter + { + public GrafanaStarter(TestLifecycle lifecycle) + : base(lifecycle) + { + } + public GrafanaStartInfo StartDashboard(RunningContainer prometheusContainer) + { + LogStart($"Starting dashboard server"); + var startupConfig = new StartupConfig(); + + var pc = prometheusContainer.ClusterExternalAddress; + var prometheusUrl = pc.Host + ":" + pc.Port; + + var workflow = lifecycle.WorkflowCreator.CreateWorkflow(); + var grafanaContainers = workflow.Start(1, Location.Unspecified, new GrafanaContainerRecipe(), startupConfig); + if (grafanaContainers.Containers.Length != 1) throw new InvalidOperationException("Expected 1 dashboard container to be created."); + + //Thread.Sleep(3000); + + var grafanaContainer = grafanaContainers.Containers.First(); + var c = grafanaContainer.ClusterExternalAddress; + + var http = new Http(new NullLog(), new DefaultTimeSet(), c, "api/"); + + // {"datasource":{"id":1,"uid":"c89eaad3-9184-429f-ac94-8ba0b1824dbb","orgId":1,"name":"CodexPrometheus","type":"prometheus","typeLogoUrl":"","access":"proxy","url":"http://kubernetes.docker.internal:31971","user":"","database":"","basicAuth":false,"basicAuthUser":"","withCredentials":false,"isDefault":false,"jsonData":{"httpMethod":"POST"},"secureJsonFields":{},"version":1,"readOnly":false},"id":1,"message":"Datasource added","name":"CodexPrometheus"} + var response = http.HttpPostJson("datasources", new GrafanaDataSource + { + uid = "c89eaad3-9184-429f-ac94-8ba0b1824dbb", + name = "CodexPrometheus", + type = "prometheus", + url = prometheusUrl, + access = "proxy", + basicAuth = false, + jsonData = new GrafanaDataSourceJsonData + { + httpMethod = "POST" + } + }); + + var response2 = http.HttpPostString("dashboards/db", GetDashboardJson()); + var jsonResponse = JsonConvert.DeserializeObject(response2); + + var grafanaUrl = c.Host + ":" + c.Port + jsonResponse.url; + System.Diagnostics.Process.Start("C:\\Users\\Ben\\AppData\\Local\\Programs\\Opera\\opera.exe", grafanaUrl); + + LogEnd("Metrics server started."); + + return new GrafanaStartInfo(grafanaUrl, grafanaContainer); + } + + private string GetDashboardJson() + { + var assembly = Assembly.GetExecutingAssembly(); + var resourceName = "DistTestCore.Metrics.dashboard.json"; + + using (Stream stream = assembly.GetManifestResourceStream(resourceName)) + using (StreamReader reader = new StreamReader(stream)) + { + var dashboard = reader.ReadToEnd(); + + return $"{{\"dashboard\": {dashboard} ,\"message\": \"Default Codex Dashboard\",\"overwrite\": false}}"; + } + } + } + + public class GrafanaStartInfo + { + public GrafanaStartInfo(string dashboardUrl, RunningContainer container) + { + DashboardUrl = dashboardUrl; + Container = container; + } + + public string DashboardUrl { get; } + public RunningContainer Container { get; } + } + + public class GrafanaDataSource + { + public string uid { get; set; } = string.Empty; + public string name { get; set; } = string.Empty; + public string type { get; set; } = string.Empty; + public string url { get; set; } = string.Empty; + public string access { get; set; } = string.Empty; + public bool basicAuth { get; set; } + public GrafanaDataSourceJsonData jsonData { get; set; } = new(); + } + + public class GrafanaDataSourceJsonData + { + public string httpMethod { get; set; } = string.Empty; + } + + public class GrafanaPostDashboardResponse + { + public int id { get; set; } + public string slug { get; set; } = string.Empty; + public string status { get; set; } = string.Empty; + public string uid { get; set; } = string.Empty; + public string url { get; set; } = string.Empty; + public int version { get; set; } + } + +} diff --git a/DistTestCore/PrometheusStarter.cs b/DistTestCore/PrometheusStarter.cs index 839061b..3b1e49c 100644 --- a/DistTestCore/PrometheusStarter.cs +++ b/DistTestCore/PrometheusStarter.cs @@ -1,9 +1,6 @@ using DistTestCore.Codex; using DistTestCore.Metrics; using KubernetesWorkflow; -using Logging; -using Newtonsoft.Json; -using System.Reflection; using System.Text; namespace DistTestCore @@ -25,85 +22,9 @@ namespace DistTestCore var runningContainers = workflow.Start(1, Location.Unspecified, new PrometheusContainerRecipe(), startupConfig); if (runningContainers.Containers.Length != 1) throw new InvalidOperationException("Expected only 1 Prometheus container to be created."); - var pc = runningContainers.Containers.First().ClusterExternalAddress; - var prometheusUrl = pc.Host + ":" + pc.Port; - - workflow = lifecycle.WorkflowCreator.CreateWorkflow(); - var grafanaContainers = workflow.Start(1, Location.Unspecified, new GrafanaContainerRecipe(), startupConfig); - if (grafanaContainers.Containers.Length != 1) throw new InvalidOperationException("should be 1"); - - Thread.Sleep(3000); - - var c = grafanaContainers.Containers.First().ClusterExternalAddress; - - var http = new Http(new NullLog(), new DefaultTimeSet(), c, "api/"); - var response = http.HttpPostJson("datasources", new GrafanaDataSource - { - uid = "c89eaad3-9184-429f-ac94-8ba0b1824dbb", - name = "CodexPrometheus", - type = "prometheus", - url = prometheusUrl, - access = "proxy", - basicAuth = false, - jsonData = new GrafanaDataSourceJsonData - { - httpMethod = "POST" - } - }); - - var response2 = http.HttpPostString("dashboards/db", GetDashboardJson()); - var jsonResponse = JsonConvert.DeserializeObject(response2); - - var grafanaUrl = c.Host + ":" + c.Port + jsonResponse.url; - System.Diagnostics.Process.Start("C:\\Users\\Ben\\AppData\\Local\\Programs\\Opera\\opera.exe", grafanaUrl); - - LogEnd("Metrics server started."); - return runningContainers; } - public class GrafanaDataSource - { - public string uid { get; set; } = string.Empty; - public string name { get; set; } = string.Empty; - public string type { get; set; } = string.Empty; - public string url { get; set; } = string.Empty; - public string access { get; set; } = string.Empty; - public bool basicAuth { get; set; } - public GrafanaDataSourceJsonData jsonData { get; set; } = new(); - } - - public class GrafanaDataSourceJsonData - { - public string httpMethod { get; set; } = string.Empty; - } - - public class GrafanaPostDashboardResponse - { - public int id { get; set; } - public string slug { get; set; } = string.Empty; - public string status { get; set; } = string.Empty; - public string uid { get; set; } = string.Empty; - public string url { get; set; } = string.Empty; - public int version { get; set; } - } - - private string GetDashboardJson() - { - var assembly = Assembly.GetExecutingAssembly(); - var resourceName = "DistTestCore.Metrics.dashboard.json"; - - //var names = assembly.GetManifestResourceNames(); - - using (Stream stream = assembly.GetManifestResourceStream(resourceName)) - using (StreamReader reader = new StreamReader(stream)) - { - var dashboard = reader.ReadToEnd(); - - return $"{{\"dashboard\": {dashboard} ,\"message\": \"Default Codex Dashboard\",\"overwrite\": false}}"; - } - } - private string GeneratePrometheusConfig(RunningContainer[] nodes) { var config = ""; diff --git a/DistTestCore/TestLifecycle.cs b/DistTestCore/TestLifecycle.cs index eede32d..0958898 100644 --- a/DistTestCore/TestLifecycle.cs +++ b/DistTestCore/TestLifecycle.cs @@ -24,6 +24,7 @@ namespace DistTestCore FileManager = new FileManager(Log, configuration); CodexStarter = new CodexStarter(this); PrometheusStarter = new PrometheusStarter(this); + GrafanaStarter = new GrafanaStarter(this); GethStarter = new GethStarter(this); testStart = DateTime.UtcNow; CodexVersion = null; @@ -38,6 +39,7 @@ namespace DistTestCore public FileManager FileManager { get; } public CodexStarter CodexStarter { get; } public PrometheusStarter PrometheusStarter { get; } + public GrafanaStarter GrafanaStarter { get; } public GethStarter GethStarter { get; } public CodexDebugVersionResponse? CodexVersion { get; private set; }