From dedb87780a95deb52d6f6ddbe3e1c4ea934ea6ca Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 12 Dec 2022 23:53:45 +0800 Subject: [PATCH 1/3] fix: adjust directory --- tencentcloud/provider.go | 17 ++-- .../r/monitor_grafana_instance.html.markdown | 2 +- .../monitor_grafana_integration.html.markdown | 2 +- ...grafana_notification_channel.html.markdown | 2 +- .../r/monitor_grafana_plugin.html.markdown | 2 +- .../monitor_grafana_sso_account.html.markdown | 2 +- .../r/monitor_tmp_alert_rule.html.markdown | 2 +- .../r/monitor_tmp_cvm_agent.html.markdown | 2 +- ...tor_tmp_exporter_integration.html.markdown | 2 +- .../docs/r/monitor_tmp_instance.html.markdown | 2 +- .../monitor_tmp_recording_rule.html.markdown | 2 +- .../r/monitor_tmp_scrape_job.html.markdown | 2 +- website/tencentcloud.erb | 78 ++++++++++++------- 13 files changed, 72 insertions(+), 45 deletions(-) diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index 3ee69607bd..069bc922bc 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -431,12 +431,6 @@ Cloud Monitor(Monitor) tencentcloud_monitor_policy_binding_object tencentcloud_monitor_binding_receiver tencentcloud_monitor_alarm_policy - tencentcloud_monitor_tmp_instance - tencentcloud_monitor_tmp_cvm_agent - tencentcloud_monitor_tmp_scrape_job - tencentcloud_monitor_tmp_exporter_integration - tencentcloud_monitor_tmp_alert_rule - tencentcloud_monitor_tmp_recording_rule tencentcloud_monitor_tmp_tke_template tencentcloud_monitor_tmp_tke_template_attachment tencentcloud_monitor_tmp_tke_alert_policy @@ -446,6 +440,17 @@ Cloud Monitor(Monitor) tencentcloud_monitor_tmp_tke_global_notification tencentcloud_monitor_tmp_tke_cluster_agent +Cloud Monitor(Prometheus) + Resource + tencentcloud_monitor_tmp_instance + tencentcloud_monitor_tmp_alert_rule + tencentcloud_monitor_tmp_exporter_integration + tencentcloud_monitor_tmp_cvm_agent + tencentcloud_monitor_tmp_scrape_job + tencentcloud_monitor_tmp_recording_rule + +Cloud Monitor(Grafana) + Resource tencentcloud_monitor_grafana_instance tencentcloud_monitor_grafana_integration tencentcloud_monitor_grafana_notification_channel diff --git a/website/docs/r/monitor_grafana_instance.html.markdown b/website/docs/r/monitor_grafana_instance.html.markdown index 853e6b61a9..69c82a6d86 100644 --- a/website/docs/r/monitor_grafana_instance.html.markdown +++ b/website/docs/r/monitor_grafana_instance.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Grafana)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_grafana_instance" sidebar_current: "docs-tencentcloud-resource-monitor_grafana_instance" diff --git a/website/docs/r/monitor_grafana_integration.html.markdown b/website/docs/r/monitor_grafana_integration.html.markdown index 24ab4ba806..9ca959eb0e 100644 --- a/website/docs/r/monitor_grafana_integration.html.markdown +++ b/website/docs/r/monitor_grafana_integration.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Grafana)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_grafana_integration" sidebar_current: "docs-tencentcloud-resource-monitor_grafana_integration" diff --git a/website/docs/r/monitor_grafana_notification_channel.html.markdown b/website/docs/r/monitor_grafana_notification_channel.html.markdown index fef2d6fa49..425aaca044 100644 --- a/website/docs/r/monitor_grafana_notification_channel.html.markdown +++ b/website/docs/r/monitor_grafana_notification_channel.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Grafana)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_grafana_notification_channel" sidebar_current: "docs-tencentcloud-resource-monitor_grafana_notification_channel" diff --git a/website/docs/r/monitor_grafana_plugin.html.markdown b/website/docs/r/monitor_grafana_plugin.html.markdown index 8febd6647f..b7864930b9 100644 --- a/website/docs/r/monitor_grafana_plugin.html.markdown +++ b/website/docs/r/monitor_grafana_plugin.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Grafana)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_grafana_plugin" sidebar_current: "docs-tencentcloud-resource-monitor_grafana_plugin" diff --git a/website/docs/r/monitor_grafana_sso_account.html.markdown b/website/docs/r/monitor_grafana_sso_account.html.markdown index b86a58ae90..a116c88e52 100644 --- a/website/docs/r/monitor_grafana_sso_account.html.markdown +++ b/website/docs/r/monitor_grafana_sso_account.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Grafana)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_grafana_sso_account" sidebar_current: "docs-tencentcloud-resource-monitor_grafana_sso_account" diff --git a/website/docs/r/monitor_tmp_alert_rule.html.markdown b/website/docs/r/monitor_tmp_alert_rule.html.markdown index 1322ec05ae..86489ac222 100644 --- a/website/docs/r/monitor_tmp_alert_rule.html.markdown +++ b/website/docs/r/monitor_tmp_alert_rule.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_alert_rule" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_alert_rule" diff --git a/website/docs/r/monitor_tmp_cvm_agent.html.markdown b/website/docs/r/monitor_tmp_cvm_agent.html.markdown index a0488dab5f..57549ca297 100644 --- a/website/docs/r/monitor_tmp_cvm_agent.html.markdown +++ b/website/docs/r/monitor_tmp_cvm_agent.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_cvm_agent" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_cvm_agent" diff --git a/website/docs/r/monitor_tmp_exporter_integration.html.markdown b/website/docs/r/monitor_tmp_exporter_integration.html.markdown index f08fdfd1e6..39c9bf8916 100644 --- a/website/docs/r/monitor_tmp_exporter_integration.html.markdown +++ b/website/docs/r/monitor_tmp_exporter_integration.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_exporter_integration" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_exporter_integration" diff --git a/website/docs/r/monitor_tmp_instance.html.markdown b/website/docs/r/monitor_tmp_instance.html.markdown index 317aa8dfad..a90b4c4466 100644 --- a/website/docs/r/monitor_tmp_instance.html.markdown +++ b/website/docs/r/monitor_tmp_instance.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_instance" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_instance" diff --git a/website/docs/r/monitor_tmp_recording_rule.html.markdown b/website/docs/r/monitor_tmp_recording_rule.html.markdown index bc3c803077..0fff3a82b4 100644 --- a/website/docs/r/monitor_tmp_recording_rule.html.markdown +++ b/website/docs/r/monitor_tmp_recording_rule.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_recording_rule" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_recording_rule" diff --git a/website/docs/r/monitor_tmp_scrape_job.html.markdown b/website/docs/r/monitor_tmp_scrape_job.html.markdown index 0e8f818294..b662bc61a4 100644 --- a/website/docs/r/monitor_tmp_scrape_job.html.markdown +++ b/website/docs/r/monitor_tmp_scrape_job.html.markdown @@ -1,5 +1,5 @@ --- -subcategory: "Cloud Monitor(Monitor)" +subcategory: "Cloud Monitor(Prometheus)" layout: "tencentcloud" page_title: "TencentCloud: tencentcloud_monitor_tmp_scrape_job" sidebar_current: "docs-tencentcloud-resource-monitor_tmp_scrape_job" diff --git a/website/tencentcloud.erb b/website/tencentcloud.erb index 23f80c18f8..92653f80df 100644 --- a/website/tencentcloud.erb +++ b/website/tencentcloud.erb @@ -665,6 +665,32 @@ +
  • + Cloud Monitor(Grafana) + +
  • Cloud Monitor(Monitor) +
    • + + +
  • + Cloud Monitor(Prometheus) +
    • -
  • - Cloud Monitor(Grafana) - -
  • Cloud Monitor(Monitor)
    • -
  • - Cloud Monitor(Prometheus) - -
  • Cloud Object Storage(COS)
    • +
  • + Managed Service for Prometheus(TMP) + +
  • MapReduce(EMR)
    • -
  • - PostgreSQL - -
  • PrivateDNS
    • +
  • + TencentCloud Managed Service for Grafana(TCMG) + +
  • TencentCloud ServiceMesh(TCM)
    • +
  • + TencentDB for PostgreSQL(PostgreSQL) + +
  • TencentDB for Redis(crs)