-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #67 from dasmeta/fix-bugs
fix(DMVP-2740): Fix dashboard
- Loading branch information
Showing
19 changed files
with
166 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,41 @@ | ||
| output "result" { | ||
| description = "description" | ||
| value = [ | ||
| value = var.balancer_name != null ? [ | ||
| [ | ||
| { type : "text/title", text : "Superset" } | ||
| { type : "text/title", text : var.service_name } | ||
| ], | ||
| [ | ||
| { type : "container/request-count", container : var.service_name, target_group_arn : var.target_group_arn, cluster : var.cluster }, | ||
| { type : "container/all-requests", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster }, | ||
| { type : "container/error-rate", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster }, | ||
| { type : "container/health-check", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster }, | ||
| { type : "container/request-count", container : var.service_name, target_group_arn : var.target_group_arn, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/all-requests", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/error-rate", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/health-check", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster, namespace : var.namespace }, | ||
| ], | ||
| [ | ||
| { type : "container/cpu", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/memory", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/network-in", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/network-out", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/cpu", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| { type : "container/memory", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| { type : "container/network-in", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| { type : "container/network-out", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| ], | ||
| [ | ||
| { type : "container/external-health-check", container : var.service_name, healthcheck_id : var.healthcheck_id, cluster : var.cluster }, | ||
| { type : "container/replicas", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/restarts", container : var.service_name, cluster : var.cluster }, | ||
| { type : "container/response-time", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster }, | ||
| { type : "container/external-health-check", container : var.service_name, healthcheck_id : var.healthcheck_id, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/replicas", container : var.service_name, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/restarts", container : var.service_name, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/response-time", container : var.service_name, target_group_arn : var.target_group_arn, balancer_name : var.balancer_name, cluster : var.cluster, namespace : var.namespace }, | ||
| # { type : "container/network", container : local.container_1 }, | ||
| ], | ||
| ] : [ | ||
| [ | ||
| { type : "text/title", text : var.service_name } | ||
| ], | ||
| [ | ||
| { type : "container/cpu", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| { type : "container/memory", container : var.service_name, cluster : var.cluster, namespace : var.namespace, anomaly_detection : true }, | ||
| { type : "container/replicas", container : var.service_name, cluster : var.cluster, namespace : var.namespace }, | ||
| { type : "container/restarts", container : var.service_name, cluster : var.cluster, namespace : var.namespace }, | ||
| ], | ||
| [ | ||
| { type : "container/network-in", container : var.service_name, cluster : var.cluster, namespace : var.namespace, width : 12, anomaly_detection : true }, | ||
| { type : "container/network-out", container : var.service_name, cluster : var.cluster, namespace : var.namespace, width : 12, anomaly_detection : true }, | ||
| ] | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # Why | ||
| Widget to render markdown text. | ||
|
|
||
| ``` | ||
| { | ||
| text: "Whatever text has to go here", | ||
| coordinates: { | ||
| x: 4 | ||
| y: 10 | ||
| width: 4 | ||
| height: 4 | ||
| } | ||
| } | ||
| ``` | ||
|
|
||
| <!-- BEGIN_TF_DOCS --> | ||
| ## Requirements | ||
|
|
||
| No requirements. | ||
|
|
||
| ## Providers | ||
|
|
||
| No providers. | ||
|
|
||
| ## Modules | ||
|
|
||
| No modules. | ||
|
|
||
| ## Resources | ||
|
|
||
| No resources. | ||
|
|
||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | <a name="input_text"></a> [text](#input\_text) | n/a | `string` | n/a | yes | | ||
| | <a name="input_y"></a> [y](#input\_y) | n/a | `number` | n/a | yes | | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Name | Description | | ||
| |------|-------------| | ||
| | <a name="output_data"></a> [data](#output\_data) | n/a | | ||
| <!-- END_TF_DOCS --> | ||
| <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
| ## Requirements | ||
|
|
||
| No requirements. | ||
|
|
||
| ## Providers | ||
|
|
||
| No providers. | ||
|
|
||
| ## Modules | ||
|
|
||
| No modules. | ||
|
|
||
| ## Resources | ||
|
|
||
| No resources. | ||
|
|
||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | <a name="input_coordinates"></a> [coordinates](#input\_coordinates) | n/a | <pre>object({<br> x : number<br> y : number<br> width : number<br> height : number<br> })</pre> | n/a | yes | | ||
| | <a name="input_text"></a> [text](#input\_text) | n/a | `string` | n/a | yes | | ||
| | <a name="input_transparent-background"></a> [transparent-background](#input\_transparent-background) | n/a | `bool` | `true` | no | | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Name | Description | | ||
| |------|-------------| | ||
| | <a name="output_data"></a> [data](#output\_data) | n/a | | ||
| <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| locals { | ||
| data = { | ||
| "type" : "text", | ||
| "x" : var.coordinates.x, | ||
| "y" : var.coordinates.y, | ||
| "width" : var.coordinates.width, | ||
| "height" : var.coordinates.height, | ||
|
|
||
| "properties" : { | ||
| "markdown" : "${var.text}" | ||
| "background" : var.transparent-background ? "transparent" : "" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| output "data" { | ||
| value = local.data | ||
| } |
17 changes: 17 additions & 0 deletions
17
modules/dashboard/modules/widgets/text/markdown/variables.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "text" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "coordinates" { | ||
| type = object({ | ||
| x : number | ||
| y : number | ||
| width : number | ||
| height : number | ||
| }) | ||
| } | ||
|
|
||
| variable "transparent-background" { | ||
| type = bool | ||
| default = true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,8 @@ variable "link_to_jump" { | |
| variable "y" { | ||
| type = number | ||
| } | ||
|
|
||
| variable "width" { | ||
| type = number | ||
| default = 24 | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters