Revert "PMM-6462 pg_stat_monitor API (#573)" (#578)

This reverts commit a85aff6.
percona · Sep 10, 2020 · 9c18b0d · 9c18b0d
1 parent 0512c2d
commit 9c18b0d
Show file tree

Hide file tree

Showing 17 changed files with 702 additions and 864 deletions.
diff --git a/api/agentlocalpb/json/agentlocalpb.json b/api/agentlocalpb/json/agentlocalpb.json
@@ -148,7 +148,6 @@
                           "QAN_MYSQL_SLOWLOG_AGENT",
                           "QAN_MONGODB_PROFILER_AGENT",
                           "QAN_POSTGRESQL_PGSTATEMENTS_AGENT",
-                          "QAN_POSTGRESQL_PGSTATMONITOR_AGENT",
                           "RDS_EXPORTER",
                           "EXTERNAL_EXPORTER"
                         ],

diff --git a/api/agentlocalpb/json/client/agent_local/status_responses.go b/api/agentlocalpb/json/client/agent_local/status_responses.go
diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go
diff --git a/api/agentpb/collector.proto b/api/agentpb/collector.proto
@@ -307,12 +307,6 @@ message MetricsBucket {
     float m_blk_write_time_cnt = 25;
     // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).
     float m_blk_write_time_sum = 26;
-    float m_cpu_user_time_cnt = 27;
-    // Total time user spent in query.
-    float m_cpu_user_time_sum = 28;
-    float m_cpu_sys_time_cnt = 29;
-    // Total time system spent in query.
-    float m_cpu_sys_time_sum = 30;
   }
   Common common = 1;
   MySQL mysql = 2;

diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go
diff --git a/api/inventorypb/agents.proto b/api/inventorypb/agents.proto
@@ -21,7 +21,6 @@ enum AgentType {
   QAN_MYSQL_SLOWLOG_AGENT = 8;
   QAN_MONGODB_PROFILER_AGENT = 9;
   QAN_POSTGRESQL_PGSTATEMENTS_AGENT = 10;
-  QAN_POSTGRESQL_PGSTATMONITOR_AGENT = 13;
   RDS_EXPORTER = 11;
   EXTERNAL_EXPORTER = 12;
 }

diff --git a/api/inventorypb/json/client/agents/list_agents_responses.go b/api/inventorypb/json/client/agents/list_agents_responses.go
diff --git a/api/inventorypb/json/inventorypb.json b/api/inventorypb/json/inventorypb.json
@@ -5027,7 +5027,6 @@
                     "QAN_MYSQL_SLOWLOG_AGENT",
                     "QAN_MONGODB_PROFILER_AGENT",
                     "QAN_POSTGRESQL_PGSTATEMENTS_AGENT",
-                    "QAN_POSTGRESQL_PGSTATMONITOR_AGENT",
                     "RDS_EXPORTER",
                     "EXTERNAL_EXPORTER"
                   ],

diff --git a/api/inventorypb/types/agent_types.go b/api/inventorypb/types/agent_types.go
@@ -4,36 +4,34 @@ import "fmt"
 
 // this list should be in sync with inventorypb/agents.pb.go
 const (
-	AgentTypePMMAgent                        = "PMM_AGENT"
-	AgentTypeNodeExporter                    = "NODE_EXPORTER"
-	AgentTypeMySQLdExporter                  = "MYSQLD_EXPORTER"
-	AgentTypeMongoDBExporter                 = "MONGODB_EXPORTER"
-	AgentTypePostgresExporter                = "POSTGRES_EXPORTER"
-	AgentTypeProxySQLExporter                = "PROXYSQL_EXPORTER"
-	AgentTypeQANMySQLPerfSchemaAgent         = "QAN_MYSQL_PERFSCHEMA_AGENT"
-	AgentTypeQANMySQLSlowlogAgent            = "QAN_MYSQL_SLOWLOG_AGENT"
-	AgentTypeQANMongoDBProfilerAgent         = "QAN_MONGODB_PROFILER_AGENT"
-	AgentTypeQANPostgreSQLPgStatementsAgent  = "QAN_POSTGRESQL_PGSTATEMENTS_AGENT"
-	AgentTypeQANPostgreSQLPgStatMonitorAgent = "QAN_POSTGRESQL_PGSTATMONITOR_AGENT"
-	AgentTypeRDSExporter                     = "RDS_EXPORTER"
-	AgentTypeExternalExporter                = "EXTERNAL_EXPORTER"
+	AgentTypePMMAgent                       = "PMM_AGENT"
+	AgentTypeNodeExporter                   = "NODE_EXPORTER"
+	AgentTypeMySQLdExporter                 = "MYSQLD_EXPORTER"
+	AgentTypeMongoDBExporter                = "MONGODB_EXPORTER"
+	AgentTypePostgresExporter               = "POSTGRES_EXPORTER"
+	AgentTypeProxySQLExporter               = "PROXYSQL_EXPORTER"
+	AgentTypeQANMySQLPerfSchemaAgent        = "QAN_MYSQL_PERFSCHEMA_AGENT"
+	AgentTypeQANMySQLSlowlogAgent           = "QAN_MYSQL_SLOWLOG_AGENT"
+	AgentTypeQANMongoDBProfilerAgent        = "QAN_MONGODB_PROFILER_AGENT"
+	AgentTypeQANPostgreSQLPgStatementsAgent = "QAN_POSTGRESQL_PGSTATEMENTS_AGENT"
+	AgentTypeRDSExporter                    = "RDS_EXPORTER"
+	AgentTypeExternalExporter               = "EXTERNAL_EXPORTER"
 )
 
 var agentTypeNames = map[string]string{
 	// no invalid
-	AgentTypePMMAgent:                        "pmm_agent",
-	AgentTypeNodeExporter:                    "node_exporter",
-	AgentTypeMySQLdExporter:                  "mysqld_exporter",
-	AgentTypeMongoDBExporter:                 "mongodb_exporter",
-	AgentTypePostgresExporter:                "postgres_exporter",
-	AgentTypeProxySQLExporter:                "proxysql_exporter",
-	AgentTypeQANMySQLPerfSchemaAgent:         "mysql_perfschema_agent",
-	AgentTypeQANMySQLSlowlogAgent:            "mysql_slowlog_agent",
-	AgentTypeQANMongoDBProfilerAgent:         "mongodb_profiler_agent",
-	AgentTypeQANPostgreSQLPgStatementsAgent:  "postgresql_pgstatements_agent",
-	AgentTypeQANPostgreSQLPgStatMonitorAgent: "postgresql_pgstatmonitor_agent",
-	AgentTypeRDSExporter:                     "rds_exporter",
-	AgentTypeExternalExporter:                "external-exporter",
+	AgentTypePMMAgent:                       "pmm_agent",
+	AgentTypeNodeExporter:                   "node_exporter",
+	AgentTypeMySQLdExporter:                 "mysqld_exporter",
+	AgentTypeMongoDBExporter:                "mongodb_exporter",
+	AgentTypePostgresExporter:               "postgres_exporter",
+	AgentTypeProxySQLExporter:               "proxysql_exporter",
+	AgentTypeQANMySQLPerfSchemaAgent:        "mysql_perfschema_agent",
+	AgentTypeQANMySQLSlowlogAgent:           "mysql_slowlog_agent",
+	AgentTypeQANMongoDBProfilerAgent:        "mongodb_profiler_agent",
+	AgentTypeQANPostgreSQLPgStatementsAgent: "postgresql_pgstatements_agent",
+	AgentTypeRDSExporter:                    "rds_exporter",
+	AgentTypeExternalExporter:               "external-exporter",
 }
 
 // AgentTypeName returns human friendly agent type to be used in reports