Skip to content

fix: update tmp_config unit #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 25, 2022
Merged

fix: update tmp_config unit #1333

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
333db4b
fix: update tmp_config unit
gitmkn Oct 25, 2022
767276b
Merge remote-tracking branch 'upstream/master' into fix/teo-unit
gitmkn Oct 25, 2022
9a4013b
fix: update tmp_config unit
gitmkn Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tencentcloud/resource_tc_monitor_tmp_tke_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ func TestAccTencentCloudMonitorTmpTkeConfig_basic(t *testing.T) {
{
Config: testAccTmpTkeConfig_update,
Check: resource.ComposeTestCheckFunc(
testAccCheckTmpTkeConfigExists("tencentcloud_monitor_tmp_tke_config.update"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "instance_id", defaultPrometheusId),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "cluster_type", defaultTkeClusterType),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "cluster_id", defaultTkeClusterId),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "raw_jobs.0.config", "scrape_configs:\n- job_name: "+raw_job_name+"\n scrape_interval: 20s\n honor_labels: true\n"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "service_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: ServiceMonitor\nmetadata:\n name: "+service_monitors_name+"\n namespace: kube-system\nspec:\n endpoints:\n - interval: 20s\n port: 8080-8080-tcp\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - __meta_kubernetes_pod_label_app\n targetLabel: application\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n app: test"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "pod_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: PodMonitor\nmetadata:\n name: "+pod_monitors_name+"\n namespace: kube-system\nspec:\n podMetricsEndpoints:\n - interval: 20s\n port: metric-port\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - instance\n regex: (.*)\n targetLabel: instance\n replacement: xxxxxx\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n k8s-app: test"),
testAccCheckTmpTkeConfigExists("tencentcloud_monitor_tmp_tke_config.basic"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "instance_id", defaultPrometheusId),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "cluster_type", defaultTkeClusterType),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "cluster_id", defaultTkeClusterId),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "raw_jobs.0.config", "scrape_configs:\n- job_name: "+raw_job_name+"\n scrape_interval: 20s\n honor_labels: true\n"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "service_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: ServiceMonitor\nmetadata:\n name: "+service_monitors_name+"\n namespace: kube-system\nspec:\n endpoints:\n - interval: 20s\n port: 8080-8080-tcp\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - __meta_kubernetes_pod_label_app\n targetLabel: application\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n app: test"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "pod_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: PodMonitor\nmetadata:\n name: "+pod_monitors_name+"\n namespace: kube-system\nspec:\n podMetricsEndpoints:\n - interval: 20s\n port: metric-port\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - instance\n regex: (.*)\n targetLabel: instance\n replacement: xxxxxx\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n k8s-app: test"),
),
},
},
Expand Down Expand Up @@ -228,7 +228,7 @@ resource "tencentcloud_monitor_tmp_tke_config" "basic" {
}`

const testAccTmpTkeConfig_update = testAccTmpTkeConfigVar + `
resource "tencentcloud_monitor_tmp_tke_config" "update" {
resource "tencentcloud_monitor_tmp_tke_config" "basic" {
instance_id = var.prometheus_id
cluster_type = var.tke_cluster_type
cluster_id = var.tke_cluster_id
Expand Down