diff --git a/bin/monrun/resources/builds.toml b/bin/monrun/resources/builds.toml index 43dc79c55..5bfb91c3c 100644 --- a/bin/monrun/resources/builds.toml +++ b/bin/monrun/resources/builds.toml @@ -1,25 +1,3 @@ -[[build]] -name = "monitor-core-v1" -description = "the prod build for monitor" -tags = ["monitor", "prod", "api"] -config.builder = "mogh-builder" -config.repo = "mbecker20/monitor" -config.branch = "next" -config.build_path = "." -config.dockerfile_path = "bin/core/Dockerfile" -config.docker_account = "mbecker2020" - -[[build]] -name = "monitor-frontend-v1" -description = "the prod frontend build for monitor" -tags = ["monitor", "prod", "frontend"] -config.builder = "mogh-builder" -config.repo = "mbecker20/monitor" -config.branch = "next" -config.build_path = "." -config.dockerfile_path = "frontend/Dockerfile" -config.docker_account = "mbecker2020" - [[build]] name = "test_logger" tags = ["test"] diff --git a/bin/monrun/resources/deployments.toml b/bin/monrun/resources/deployments.toml index d11662322..7b8365753 100644 --- a/bin/monrun/resources/deployments.toml +++ b/bin/monrun/resources/deployments.toml @@ -1,27 +1,3 @@ -[[deployment]] -name = "monitor-core-v1-dev" -description = "v1 core api" -tags = ["monitor", "v1", "api"] -config.server = "mogh-server" -config.redeploy_on_build = true -config.image.type = "Build" -config.image.params.build = "monitor-core-v1" -[[deployment.config.volumes]] -local = "/home/ubuntu/.monitor-next/core.config.toml" -container = "/config/config.toml" -[[deployment.config.environment]] -variable = "PORT" -value = "9001" - -[[deployment]] -name = "monitor-frontend-v1-dev" -description = "v1 frontend" -tags = ["monitor", "v1", "frontend"] -config.server = "mogh-server" -config.redeploy_on_build = true -config.image.type = "Build" -config.image.params.build = "monitor-frontend-v1" - [[deployment]] name = "hello-world" tags = ["test"] @@ -45,10 +21,31 @@ config.image.params.build = "alert_logger" [[deployment]] name = "update_logger" -tags = ["test"] +tags = ["test", "logging"] config.server = "mogh-server" config.image.type = "Build" config.image.params.build = "update_logger" [[deployment.config.environment]] variable = "MONITOR_ADDRESS" -value = "http://localhost:9001" \ No newline at end of file +value = "http://localhost:9001" + +[[deployment]] +name = "vector" +tags = ["logging"] +config.server = "mogh-server" +config.image.type = "Image" +config.image.params.image = "timberio/vector" + +[[deployment]] +name = "loki" +tags = ["logging"] +config.server = "mogh-server" +config.image.type = "Image" +config.image.params.image = "grafana/loki" + +[[deployment]] +name = "grafana" +tags = ["frontend"] +config.server = "mogh-server" +config.image.type = "Image" +config.image.params.image = "grafana/grafana" \ No newline at end of file diff --git a/bin/monrun/resources/procedures.toml b/bin/monrun/resources/procedures.toml index 871e5187c..8b1378917 100644 --- a/bin/monrun/resources/procedures.toml +++ b/bin/monrun/resources/procedures.toml @@ -1,41 +1 @@ -[[procedure]] -name = "build-deploy-monitor-v1" -description = "builds v1 core / frontend, then redeploys them" -tags = ["monitor", "v1"] -config.type = "Sequence" -[[procedure.config.data]] -enabled = true -execution.type = "RunProcedure" -execution.params.procedure = "build-monitor-v1" -[[procedure.config.data]] -enabled = true -execution.type = "RunProcedure" -execution.params.procedure = "deploy-monitor-v1" -[[procedure]] -name = "deploy-monitor-v1" -description = "deploys v1 core / frontend" -tags = ["monitor", "v1"] -config.type = "Parallel" -[[procedure.config.data]] -enabled = true -execution.type = "Deploy" -execution.params.deployment = "monitor-core-v1-dev" -[[procedure.config.data]] -enabled = true -execution.type = "Deploy" -execution.params.deployment = "monitor-frontend-v1-dev" - -[[procedure]] -name = "build-monitor-v1" -description = "builds v1 core / frontend" -tags = ["monitor", "v1"] -config.type = "Parallel" -[[procedure.config.data]] -enabled = true -execution.type = "RunBuild" -execution.params.build = "monitor-core-v1" -[[procedure.config.data]] -enabled = true -execution.type = "RunBuild" -execution.params.build = "monitor-frontend-v1" diff --git a/bin/monrun/resources/servers.toml b/bin/monrun/resources/servers.toml index cc5ebf769..7070a0356 100644 --- a/bin/monrun/resources/servers.toml +++ b/bin/monrun/resources/servers.toml @@ -9,5 +9,5 @@ config.region = "us-east-2" name = "testo" description = "test server 1" tags = ["mogh", "test"] -config.address = "" +config.address = "http://locahost:8120" config.enabled = false \ No newline at end of file diff --git a/frontend/src/components/alert/index.tsx b/frontend/src/components/alert/index.tsx index 3bb9792bd..79594229a 100644 --- a/frontend/src/components/alert/index.tsx +++ b/frontend/src/components/alert/index.tsx @@ -101,7 +101,7 @@ const AlertDetailsDialog = ({ id }: { id: string }) => { Details - + {alert && ( <>