diff --git a/api/dump/v1/dump.pb.go b/api/dump/v1/dump.pb.go
index 6b1fa79550..f13b0d71bd 100644
--- a/api/dump/v1/dump.pb.go
+++ b/api/dump/v1/dump.pb.go
@@ -897,58 +897,54 @@ var file_dump_v1_dump_proto_rawDesc = []byte{
 	0x47, 0x52, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x44, 0x55, 0x4d, 0x50, 0x5f,
 	0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x02,
 	0x12, 0x15, 0x0a, 0x11, 0x44, 0x55, 0x4d, 0x50, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f,
-	0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x32, 0x80, 0x05, 0x0a, 0x0c, 0x44, 0x75, 0x6d, 0x70,
-	0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x78, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x72,
+	0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x32, 0xc8, 0x04, 0x0a, 0x0c, 0x44, 0x75, 0x6d, 0x70,
+	0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6d, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x72,
 	0x74, 0x44, 0x75, 0x6d, 0x70, 0x12, 0x1e, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62,
 	0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62,
 	0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01,
-	0x2a, 0x22, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x2f, 0x53, 0x74, 0x61,
-	0x72, 0x74, 0x12, 0x77, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x12,
-	0x1e, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x1f, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x3a, 0x01, 0x2a, 0x22, 0x1e, 0x2f, 0x76, 0x31,
-	0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x64, 0x75, 0x6d, 0x70,
-	0x2f, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x2f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x7c, 0x0a, 0x0a, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x75, 0x6d, 0x70, 0x12, 0x1f, 0x2e, 0x64, 0x75, 0x6d, 0x70,
-	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44,
-	0x75, 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x64, 0x75, 0x6d,
-	0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2b, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e,
-	0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d,
-	0x70, 0x73, 0x2f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x0b, 0x47, 0x65,
-	0x74, 0x44, 0x75, 0x6d, 0x70, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x20, 0x2e, 0x64, 0x75, 0x6d, 0x70,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01,
+	0x2a, 0x22, 0x14, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70,
+	0x73, 0x2f, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x6c, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x75, 0x6d, 0x70, 0x73, 0x12, 0x1e, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x3a, 0x01, 0x2a,
+	0x22, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70, 0x73,
+	0x2f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x71, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44,
+	0x75, 0x6d, 0x70, 0x12, 0x1f, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01,
+	0x2a, 0x22, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70,
+	0x73, 0x2f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x75, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x44,
+	0x75, 0x6d, 0x70, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x20, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x75, 0x6d, 0x70, 0x4c, 0x6f,
+	0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x64, 0x75, 0x6d, 0x70,
 	0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x75, 0x6d, 0x70,
-	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x64, 0x75,
-	0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x75,
-	0x6d, 0x70, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x76, 0x31, 0x2f, 0x6d,
-	0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44,
-	0x75, 0x6d, 0x70, 0x73, 0x2f, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x7c, 0x0a, 0x0a,
-	0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x44, 0x75, 0x6d, 0x70, 0x12, 0x1f, 0x2e, 0x64, 0x75, 0x6d,
-	0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64,
-	0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x64, 0x75,
-	0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61,
-	0x64, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2b, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x01, 0x2a, 0x22, 0x20, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61,
-	0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75,
-	0x6d, 0x70, 0x73, 0x2f, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x9e, 0x01, 0x0a, 0x10, 0x63,
-	0x6f, 0x6d, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42,
-	0x09, 0x44, 0x75, 0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61,
-	0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x76, 0x31,
-	0x3b, 0x64, 0x75, 0x6d, 0x70, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x44,
-	0x58, 0x58, 0xaa, 0x02, 0x0c, 0x44, 0x75, 0x6d, 0x70, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xca, 0x02, 0x0c, 0x44, 0x75, 0x6d, 0x70, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xe2, 0x02, 0x18, 0x44, 0x75, 0x6d, 0x70, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x44, 0x75,
-	0x6d, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x01, 0x2a, 0x22, 0x16, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x75, 0x6d,
+	0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x2f, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12,
+	0x71, 0x0a, 0x0a, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x44, 0x75, 0x6d, 0x70, 0x12, 0x1f, 0x2e,
+	0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x70, 0x6c,
+	0x6f, 0x61, 0x64, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,
+	0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x70,
+	0x6c, 0x6f, 0x61, 0x64, 0x44, 0x75, 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x76, 0x31,
+	0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x44, 0x75, 0x6d, 0x70, 0x73, 0x2f, 0x55, 0x70, 0x6c, 0x6f,
+	0x61, 0x64, 0x42, 0x9e, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x75, 0x6d, 0x70, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x09, 0x44, 0x75, 0x6d, 0x70, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x64, 0x75, 0x6d, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x75, 0x6d, 0x70, 0x76, 0x31, 0x62,
+	0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x44, 0x58, 0x58, 0xaa, 0x02, 0x0c, 0x44, 0x75, 0x6d,
+	0x70, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x0c, 0x44, 0x75, 0x6d, 0x70,
+	0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x18, 0x44, 0x75, 0x6d, 0x70, 0x5c,
+	0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x44, 0x75, 0x6d, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65,
+	0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/api/dump/v1/dump.pb.gw.go b/api/dump/v1/dump.pb.gw.go
index 438d49b44a..29e70d52ff 100644
--- a/api/dump/v1/dump.pb.gw.go
+++ b/api/dump/v1/dump.pb.gw.go
@@ -206,7 +206,7 @@ func RegisterDumpsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/StartDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Start"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/StartDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Start"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -230,7 +230,7 @@ func RegisterDumpsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/ListDumps", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/List"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/ListDumps", runtime.WithHTTPPathPattern("/v1/dump/Dumps/List"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -254,7 +254,7 @@ func RegisterDumpsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/DeleteDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Delete"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/DeleteDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Delete"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -278,7 +278,7 @@ func RegisterDumpsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/GetDumpLogs", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/GetLogs"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/GetDumpLogs", runtime.WithHTTPPathPattern("/v1/dump/Dumps/GetLogs"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -302,7 +302,7 @@ func RegisterDumpsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/UploadDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Upload"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/dump.v1beta1.DumpsService/UploadDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Upload"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -364,7 +364,7 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/StartDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Start"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/StartDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Start"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -385,7 +385,7 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/ListDumps", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/List"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/ListDumps", runtime.WithHTTPPathPattern("/v1/dump/Dumps/List"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -406,7 +406,7 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/DeleteDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Delete"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/DeleteDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Delete"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -427,7 +427,7 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/GetDumpLogs", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/GetLogs"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/GetDumpLogs", runtime.WithHTTPPathPattern("/v1/dump/Dumps/GetLogs"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -448,7 +448,7 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/UploadDump", runtime.WithHTTPPathPattern("/v1/management/dump/Dumps/Upload"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/dump.v1beta1.DumpsService/UploadDump", runtime.WithHTTPPathPattern("/v1/dump/Dumps/Upload"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -467,15 +467,15 @@ func RegisterDumpsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMu
 }
 
 var (
-	pattern_DumpsService_StartDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v1", "management", "dump", "Dumps", "Start"}, ""))
+	pattern_DumpsService_StartDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v1", "dump", "Dumps", "Start"}, ""))
 
-	pattern_DumpsService_ListDumps_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v1", "management", "dump", "Dumps", "List"}, ""))
+	pattern_DumpsService_ListDumps_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v1", "dump", "Dumps", "List"}, ""))
 
-	pattern_DumpsService_DeleteDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v1", "management", "dump", "Dumps", "Delete"}, ""))
+	pattern_DumpsService_DeleteDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v1", "dump", "Dumps", "Delete"}, ""))
 
-	pattern_DumpsService_GetDumpLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v1", "management", "dump", "Dumps", "GetLogs"}, ""))
+	pattern_DumpsService_GetDumpLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v1", "dump", "Dumps", "GetLogs"}, ""))
 
-	pattern_DumpsService_UploadDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v1", "management", "dump", "Dumps", "Upload"}, ""))
+	pattern_DumpsService_UploadDump_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v1", "dump", "Dumps", "Upload"}, ""))
 )
 
 var (
diff --git a/api/dump/v1/dump.proto b/api/dump/v1/dump.proto
index 8e64ba3ba3..192958bc25 100644
--- a/api/dump/v1/dump.proto
+++ b/api/dump/v1/dump.proto
@@ -89,35 +89,35 @@ service DumpsService {
   // StartDump request creates pmm dump.
   rpc StartDump(StartDumpRequest) returns (StartDumpResponse) {
     option (google.api.http) = {
-      post: "/v1/management/dump/Dumps/Start"
+      post: "/v1/dump/Dumps/Start"
       body: "*"
     };
   }
   // ListDumps returns a list of all pmm dumps.
   rpc ListDumps(ListDumpsRequest) returns (ListDumpsResponse) {
     option (google.api.http) = {
-      post: "/v1/management/dump/Dumps/List"
+      post: "/v1/dump/Dumps/List"
       body: "*"
     };
   }
   // DeleteDump deletes specified pmm dump.
   rpc DeleteDump(DeleteDumpRequest) returns (DeleteDumpResponse) {
     option (google.api.http) = {
-      post: "/v1/management/dump/Dumps/Delete"
+      post: "/v1/dump/Dumps/Delete"
       body: "*"
     };
   }
   // GetLogs returns logs from pmm-dump tool.
   rpc GetDumpLogs(GetDumpLogsRequest) returns (GetDumpLogsResponse) {
     option (google.api.http) = {
-      post: "/v1/management/dump/Dumps/GetLogs"
+      post: "/v1/dump/Dumps/GetLogs"
       body: "*"
     };
   }
   // UploadDump uploads selected dumps to remote server.
   rpc UploadDump(UploadDumpRequest) returns (UploadDumpResponse) {
     option (google.api.http) = {
-      post: "/v1/management/dump/Dumps/Upload"
+      post: "/v1/dump/Dumps/Upload"
       body: "*"
     };
   }
diff --git a/api/dump/v1/json/client/dumps_service/delete_dump_responses.go b/api/dump/v1/json/client/dumps_service/delete_dump_responses.go
index d9f4b3eb1a..c98454dabe 100644
--- a/api/dump/v1/json/client/dumps_service/delete_dump_responses.go
+++ b/api/dump/v1/json/client/dumps_service/delete_dump_responses.go
@@ -58,7 +58,7 @@ type DeleteDumpOK struct {
 }
 
 func (o *DeleteDumpOK) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Delete][%d] deleteDumpOk  %+v", 200, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Delete][%d] deleteDumpOk  %+v", 200, o.Payload)
 }
 
 func (o *DeleteDumpOK) GetPayload() interface{} {
@@ -98,7 +98,7 @@ func (o *DeleteDumpDefault) Code() int {
 }
 
 func (o *DeleteDumpDefault) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Delete][%d] DeleteDump default  %+v", o._statusCode, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Delete][%d] DeleteDump default  %+v", o._statusCode, o.Payload)
 }
 
 func (o *DeleteDumpDefault) GetPayload() *DeleteDumpDefaultBody {
diff --git a/api/dump/v1/json/client/dumps_service/dumps_service_client.go b/api/dump/v1/json/client/dumps_service/dumps_service_client.go
index 60d637ee1c..6d3e9184d9 100644
--- a/api/dump/v1/json/client/dumps_service/dumps_service_client.go
+++ b/api/dump/v1/json/client/dumps_service/dumps_service_client.go
@@ -52,7 +52,7 @@ func (a *Client) DeleteDump(params *DeleteDumpParams, opts ...ClientOption) (*De
 	op := &runtime.ClientOperation{
 		ID:                 "DeleteDump",
 		Method:             "POST",
-		PathPattern:        "/v1/management/dump/Dumps/Delete",
+		PathPattern:        "/v1/dump/Dumps/Delete",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json"},
 		Schemes:            []string{"http", "https"},
@@ -89,7 +89,7 @@ func (a *Client) GetDumpLogs(params *GetDumpLogsParams, opts ...ClientOption) (*
 	op := &runtime.ClientOperation{
 		ID:                 "GetDumpLogs",
 		Method:             "POST",
-		PathPattern:        "/v1/management/dump/Dumps/GetLogs",
+		PathPattern:        "/v1/dump/Dumps/GetLogs",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json"},
 		Schemes:            []string{"http", "https"},
@@ -126,7 +126,7 @@ func (a *Client) ListDumps(params *ListDumpsParams, opts ...ClientOption) (*List
 	op := &runtime.ClientOperation{
 		ID:                 "ListDumps",
 		Method:             "POST",
-		PathPattern:        "/v1/management/dump/Dumps/List",
+		PathPattern:        "/v1/dump/Dumps/List",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json"},
 		Schemes:            []string{"http", "https"},
@@ -163,7 +163,7 @@ func (a *Client) StartDump(params *StartDumpParams, opts ...ClientOption) (*Star
 	op := &runtime.ClientOperation{
 		ID:                 "StartDump",
 		Method:             "POST",
-		PathPattern:        "/v1/management/dump/Dumps/Start",
+		PathPattern:        "/v1/dump/Dumps/Start",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json"},
 		Schemes:            []string{"http", "https"},
@@ -200,7 +200,7 @@ func (a *Client) UploadDump(params *UploadDumpParams, opts ...ClientOption) (*Up
 	op := &runtime.ClientOperation{
 		ID:                 "UploadDump",
 		Method:             "POST",
-		PathPattern:        "/v1/management/dump/Dumps/Upload",
+		PathPattern:        "/v1/dump/Dumps/Upload",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json"},
 		Schemes:            []string{"http", "https"},
diff --git a/api/dump/v1/json/client/dumps_service/get_dump_logs_responses.go b/api/dump/v1/json/client/dumps_service/get_dump_logs_responses.go
index c37f19ab83..d685794fc7 100644
--- a/api/dump/v1/json/client/dumps_service/get_dump_logs_responses.go
+++ b/api/dump/v1/json/client/dumps_service/get_dump_logs_responses.go
@@ -58,7 +58,7 @@ type GetDumpLogsOK struct {
 }
 
 func (o *GetDumpLogsOK) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/GetLogs][%d] getDumpLogsOk  %+v", 200, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/GetLogs][%d] getDumpLogsOk  %+v", 200, o.Payload)
 }
 
 func (o *GetDumpLogsOK) GetPayload() *GetDumpLogsOKBody {
@@ -100,7 +100,7 @@ func (o *GetDumpLogsDefault) Code() int {
 }
 
 func (o *GetDumpLogsDefault) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/GetLogs][%d] GetDumpLogs default  %+v", o._statusCode, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/GetLogs][%d] GetDumpLogs default  %+v", o._statusCode, o.Payload)
 }
 
 func (o *GetDumpLogsDefault) GetPayload() *GetDumpLogsDefaultBody {
diff --git a/api/dump/v1/json/client/dumps_service/list_dumps_responses.go b/api/dump/v1/json/client/dumps_service/list_dumps_responses.go
index 423f638dd0..5a03a44c0e 100644
--- a/api/dump/v1/json/client/dumps_service/list_dumps_responses.go
+++ b/api/dump/v1/json/client/dumps_service/list_dumps_responses.go
@@ -60,7 +60,7 @@ type ListDumpsOK struct {
 }
 
 func (o *ListDumpsOK) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/List][%d] listDumpsOk  %+v", 200, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/List][%d] listDumpsOk  %+v", 200, o.Payload)
 }
 
 func (o *ListDumpsOK) GetPayload() *ListDumpsOKBody {
@@ -102,7 +102,7 @@ func (o *ListDumpsDefault) Code() int {
 }
 
 func (o *ListDumpsDefault) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/List][%d] ListDumps default  %+v", o._statusCode, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/List][%d] ListDumps default  %+v", o._statusCode, o.Payload)
 }
 
 func (o *ListDumpsDefault) GetPayload() *ListDumpsDefaultBody {
diff --git a/api/dump/v1/json/client/dumps_service/start_dump_responses.go b/api/dump/v1/json/client/dumps_service/start_dump_responses.go
index 3a4629c3da..4c22a19be3 100644
--- a/api/dump/v1/json/client/dumps_service/start_dump_responses.go
+++ b/api/dump/v1/json/client/dumps_service/start_dump_responses.go
@@ -59,7 +59,7 @@ type StartDumpOK struct {
 }
 
 func (o *StartDumpOK) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Start][%d] startDumpOk  %+v", 200, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Start][%d] startDumpOk  %+v", 200, o.Payload)
 }
 
 func (o *StartDumpOK) GetPayload() *StartDumpOKBody {
@@ -101,7 +101,7 @@ func (o *StartDumpDefault) Code() int {
 }
 
 func (o *StartDumpDefault) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Start][%d] StartDump default  %+v", o._statusCode, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Start][%d] StartDump default  %+v", o._statusCode, o.Payload)
 }
 
 func (o *StartDumpDefault) GetPayload() *StartDumpDefaultBody {
diff --git a/api/dump/v1/json/client/dumps_service/upload_dump_responses.go b/api/dump/v1/json/client/dumps_service/upload_dump_responses.go
index ed676607f0..47abc563a3 100644
--- a/api/dump/v1/json/client/dumps_service/upload_dump_responses.go
+++ b/api/dump/v1/json/client/dumps_service/upload_dump_responses.go
@@ -58,7 +58,7 @@ type UploadDumpOK struct {
 }
 
 func (o *UploadDumpOK) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Upload][%d] uploadDumpOk  %+v", 200, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Upload][%d] uploadDumpOk  %+v", 200, o.Payload)
 }
 
 func (o *UploadDumpOK) GetPayload() interface{} {
@@ -98,7 +98,7 @@ func (o *UploadDumpDefault) Code() int {
 }
 
 func (o *UploadDumpDefault) Error() string {
-	return fmt.Sprintf("[POST /v1/management/dump/Dumps/Upload][%d] UploadDump default  %+v", o._statusCode, o.Payload)
+	return fmt.Sprintf("[POST /v1/dump/Dumps/Upload][%d] UploadDump default  %+v", o._statusCode, o.Payload)
 }
 
 func (o *UploadDumpDefault) GetPayload() *UploadDumpDefaultBody {
diff --git a/api/dump/v1/json/v1.json b/api/dump/v1/json/v1.json
index c96cd4fbf8..10327c3ede 100644
--- a/api/dump/v1/json/v1.json
+++ b/api/dump/v1/json/v1.json
@@ -15,7 +15,7 @@
     "version": "v1beta1"
   },
   "paths": {
-    "/v1/management/dump/Dumps/Delete": {
+    "/v1/dump/Dumps/Delete": {
       "post": {
         "tags": [
           "DumpsService"
@@ -82,7 +82,7 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/GetLogs": {
+    "/v1/dump/Dumps/GetLogs": {
       "post": {
         "tags": [
           "DumpsService"
@@ -181,7 +181,7 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/List": {
+    "/v1/dump/Dumps/List": {
       "post": {
         "tags": [
           "DumpsService"
@@ -287,7 +287,7 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/Start": {
+    "/v1/dump/Dumps/Start": {
       "post": {
         "tags": [
           "DumpsService"
@@ -378,7 +378,7 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/Upload": {
+    "/v1/dump/Dumps/Upload": {
       "post": {
         "tags": [
           "DumpsService"
diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
index 47cc4d18fd..b6a2274c59 100644
--- a/api/swagger/swagger-dev.json
+++ b/api/swagger/swagger-dev.json
@@ -6499,14 +6499,13 @@
         }
       }
     },
-    "/v1/inventory/Agents/Add": {
+    "/v1/dump/Dumps/Delete": {
       "post": {
-        "description": "Adds an Agent to Inventory. Only one top-level parameter should be passed.",
         "tags": [
-          "AgentsService"
+          "DumpsService"
         ],
-        "summary": "Add an Agent to Inventory",
-        "operationId": "AddAgent",
+        "summary": "DeleteDump deletes specified pmm dump.",
+        "operationId": "DeleteDump",
         "parameters": [
           {
             "name": "body",
@@ -6515,343 +6514,466 @@
             "schema": {
               "type": "object",
               "properties": {
-                "pmm_agent": {
-                  "type": "object",
-                  "properties": {
-                    "runs_on_node_id": {
-                      "description": "Node identifier where this instance runs.",
-                      "type": "string",
-                      "x-order": 0
-                    },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      },
-                      "x-order": 1
-                    }
+                "dump_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
                   },
                   "x-order": 0
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 0
                 },
-                "node_exporter": {
-                  "type": "object",
-                  "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
-                      "type": "string",
-                      "x-order": 0
-                    },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      },
-                      "x-order": 1
-                    },
-                    "push_metrics": {
-                      "description": "Enables push metrics mode for exporter.",
-                      "type": "boolean",
-                      "x-order": 2
+                "message": {
+                  "type": "string",
+                  "x-order": 1
+                },
+                "details": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "@type": {
+                        "type": "string",
+                        "x-order": 0
+                      }
                     },
-                    "disable_collectors": {
-                      "description": "List of collector names to disable in this exporter.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
+                    "additionalProperties": false
+                  },
+                  "x-order": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/dump/Dumps/GetLogs": {
+      "post": {
+        "tags": [
+          "DumpsService"
+        ],
+        "summary": "GetLogs returns logs from pmm-dump tool.",
+        "operationId": "GetDumpLogs",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "dump_id": {
+                  "type": "string",
+                  "x-order": 0
+                },
+                "offset": {
+                  "type": "integer",
+                  "format": "int64",
+                  "x-order": 1
+                },
+                "limit": {
+                  "type": "integer",
+                  "format": "int64",
+                  "x-order": 2
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "logs": {
+                  "type": "array",
+                  "items": {
+                    "description": "LogChunk represent one chunk of logs.",
+                    "type": "object",
+                    "properties": {
+                      "chunk_id": {
+                        "type": "integer",
+                        "format": "int64",
+                        "x-order": 0
                       },
-                      "x-order": 3
-                    },
-                    "log_level": {
-                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
-                      "type": "string",
-                      "title": "Log level for exporters",
-                      "default": "LOG_LEVEL_UNSPECIFIED",
-                      "enum": [
-                        "LOG_LEVEL_UNSPECIFIED",
-                        "LOG_LEVEL_FATAL",
-                        "LOG_LEVEL_ERROR",
-                        "LOG_LEVEL_WARN",
-                        "LOG_LEVEL_INFO",
-                        "LOG_LEVEL_DEBUG"
-                      ],
-                      "x-order": 4
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Expose the node_exporter process on all public interfaces",
-                      "x-order": 5
+                      "data": {
+                        "type": "string",
+                        "x-order": 1
+                      }
                     }
                   },
+                  "x-order": 0
+                },
+                "end": {
+                  "type": "boolean",
                   "x-order": 1
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 0
                 },
-                "mysqld_exporter": {
-                  "type": "object",
-                  "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
-                      "type": "string",
-                      "x-order": 0
-                    },
-                    "service_id": {
-                      "description": "Service identifier.",
-                      "type": "string",
-                      "x-order": 1
-                    },
-                    "username": {
-                      "description": "MySQL username for scraping metrics.",
-                      "type": "string",
-                      "x-order": 2
-                    },
-                    "password": {
-                      "description": "MySQL password for scraping metrics.",
-                      "type": "string",
-                      "x-order": 3
-                    },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
-                      "x-order": 4
-                    },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation.",
-                      "type": "boolean",
-                      "x-order": 5
-                    },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
-                      "x-order": 6
-                    },
-                    "tls_cert": {
-                      "description": "Client certificate.",
-                      "type": "string",
-                      "x-order": 7
-                    },
-                    "tls_key": {
-                      "description": "Password for decrypting tls_cert.",
-                      "type": "string",
-                      "x-order": 8
-                    },
-                    "tablestats_group_table_limit": {
-                      "description": "Tablestats group collectors will be disabled if there are more than that number of tables.\n0 means tablestats group collectors are always enabled (no limit).\nNegative value means tablestats group collectors are always disabled.",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 9
+                "message": {
+                  "type": "string",
+                  "x-order": 1
+                },
+                "details": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "@type": {
+                        "type": "string",
+                        "x-order": 0
+                      }
                     },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      },
-                      "x-order": 10
-                    },
-                    "skip_connection_check": {
-                      "description": "Skip connection check.",
-                      "type": "boolean",
-                      "x-order": 11
-                    },
-                    "push_metrics": {
-                      "description": "Enables push metrics mode for exporter.",
-                      "type": "boolean",
-                      "x-order": 12
-                    },
-                    "disable_collectors": {
-                      "description": "List of collector names to disable in this exporter.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      },
-                      "x-order": 13
-                    },
-                    "agent_password": {
-                      "description": "Custom password for exporter endpoint /metrics.",
-                      "type": "string",
-                      "x-order": 14
-                    },
-                    "log_level": {
-                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
-                      "type": "string",
-                      "title": "Log level for exporters",
-                      "default": "LOG_LEVEL_UNSPECIFIED",
-                      "enum": [
-                        "LOG_LEVEL_UNSPECIFIED",
-                        "LOG_LEVEL_FATAL",
-                        "LOG_LEVEL_ERROR",
-                        "LOG_LEVEL_WARN",
-                        "LOG_LEVEL_INFO",
-                        "LOG_LEVEL_DEBUG"
-                      ],
-                      "x-order": 15
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 16
-                    }
+                    "additionalProperties": false
                   },
                   "x-order": 2
-                },
-                "mongodb_exporter": {
-                  "type": "object",
-                  "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
-                      "type": "string",
-                      "x-order": 0
-                    },
-                    "service_id": {
-                      "description": "Service identifier.",
-                      "type": "string",
-                      "x-order": 1
-                    },
-                    "username": {
-                      "description": "MongoDB username for scraping metrics.",
-                      "type": "string",
-                      "x-order": 2
-                    },
-                    "password": {
-                      "description": "MongoDB password for scraping metrics.",
-                      "type": "string",
-                      "x-order": 3
-                    },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
-                      "x-order": 4
-                    },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation.",
-                      "type": "boolean",
-                      "x-order": 5
-                    },
-                    "tls_certificate_key": {
-                      "description": "Client certificate and key.",
-                      "type": "string",
-                      "x-order": 6
-                    },
-                    "tls_certificate_key_file_password": {
-                      "description": "Password for decrypting tls_certificate_key.",
-                      "type": "string",
-                      "x-order": 7
-                    },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
-                      "x-order": 8
-                    },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/dump/Dumps/List": {
+      "post": {
+        "tags": [
+          "DumpsService"
+        ],
+        "summary": "ListDumps returns a list of all pmm dumps.",
+        "operationId": "ListDumps",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "dumps": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "dump_id": {
+                        "type": "string",
+                        "x-order": 0
                       },
-                      "x-order": 9
-                    },
-                    "skip_connection_check": {
-                      "description": "Skip connection check.",
-                      "type": "boolean",
-                      "x-order": 10
-                    },
-                    "push_metrics": {
-                      "description": "Enables push metrics mode for exporter.",
-                      "type": "boolean",
-                      "x-order": 11
-                    },
-                    "disable_collectors": {
-                      "description": "List of collector names to disable in this exporter.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
+                      "status": {
+                        "type": "string",
+                        "default": "DUMP_STATUS_UNSPECIFIED",
+                        "enum": [
+                          "DUMP_STATUS_UNSPECIFIED",
+                          "DUMP_STATUS_IN_PROGRESS",
+                          "DUMP_STATUS_SUCCESS",
+                          "DUMP_STATUS_ERROR"
+                        ],
+                        "x-order": 1
                       },
-                      "x-order": 12
-                    },
-                    "authentication_mechanism": {
-                      "description": "Authentication mechanism.\nSee https://docs.mongodb.com/manual/reference/connection-string/#mongodb-urioption-urioption.authMechanism\nfor details.",
-                      "type": "string",
-                      "x-order": 13
-                    },
-                    "authentication_database": {
-                      "description": "Authentication database.",
-                      "type": "string",
-                      "x-order": 14
-                    },
-                    "agent_password": {
-                      "description": "Custom password for exporter endpoint /metrics.",
-                      "type": "string",
-                      "x-order": 15
-                    },
-                    "stats_collections": {
-                      "type": "array",
-                      "title": "List of colletions to get stats from. Can use *",
-                      "items": {
-                        "type": "string"
+                      "service_names": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        },
+                        "x-order": 2
                       },
-                      "x-order": 16
-                    },
-                    "collections_limit": {
-                      "type": "integer",
-                      "format": "int32",
-                      "title": "Collections limit. Only get Databases and collection stats if the total number of collections in the server\nis less than this value. 0: no limit",
-                      "x-order": 17
-                    },
-                    "log_level": {
-                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
-                      "type": "string",
-                      "title": "Log level for exporters",
-                      "default": "LOG_LEVEL_UNSPECIFIED",
-                      "enum": [
-                        "LOG_LEVEL_UNSPECIFIED",
-                        "LOG_LEVEL_FATAL",
-                        "LOG_LEVEL_ERROR",
-                        "LOG_LEVEL_WARN",
-                        "LOG_LEVEL_INFO",
-                        "LOG_LEVEL_DEBUG"
-                      ],
-                      "x-order": 18
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 19
+                      "start_time": {
+                        "type": "string",
+                        "format": "date-time",
+                        "x-order": 3
+                      },
+                      "end_time": {
+                        "type": "string",
+                        "format": "date-time",
+                        "x-order": 4
+                      },
+                      "created_at": {
+                        "type": "string",
+                        "format": "date-time",
+                        "x-order": 5
+                      }
                     }
                   },
-                  "x-order": 3
+                  "x-order": 0
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 0
                 },
-                "postgres_exporter": {
-                  "type": "object",
-                  "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
+                "message": {
+                  "type": "string",
+                  "x-order": 1
+                },
+                "details": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "@type": {
+                        "type": "string",
+                        "x-order": 0
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  "x-order": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/dump/Dumps/Start": {
+      "post": {
+        "tags": [
+          "DumpsService"
+        ],
+        "summary": "StartDump request creates pmm dump.",
+        "operationId": "StartDump",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "service_names": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  },
+                  "x-order": 0
+                },
+                "start_time": {
+                  "type": "string",
+                  "format": "date-time",
+                  "x-order": 1
+                },
+                "end_time": {
+                  "type": "string",
+                  "format": "date-time",
+                  "x-order": 2
+                },
+                "export_qan": {
+                  "type": "boolean",
+                  "x-order": 3
+                },
+                "ignore_load": {
+                  "type": "boolean",
+                  "x-order": 4
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "dump_id": {
+                  "type": "string",
+                  "x-order": 0
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 0
+                },
+                "message": {
+                  "type": "string",
+                  "x-order": 1
+                },
+                "details": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "@type": {
+                        "type": "string",
+                        "x-order": 0
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  "x-order": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/dump/Dumps/Upload": {
+      "post": {
+        "tags": [
+          "DumpsService"
+        ],
+        "summary": "UploadDump uploads selected dumps to remote server.",
+        "operationId": "UploadDump",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "dump_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  },
+                  "x-order": 0
+                },
+                "sftp_parameters": {
+                  "type": "object",
+                  "properties": {
+                    "address": {
                       "type": "string",
                       "x-order": 0
                     },
-                    "service_id": {
-                      "description": "Service identifier.",
+                    "user": {
                       "type": "string",
                       "x-order": 1
                     },
-                    "username": {
-                      "description": "PostgreSQL username for scraping metrics.",
+                    "password": {
                       "type": "string",
                       "x-order": 2
                     },
-                    "password": {
-                      "description": "PostgreSQL password for scraping metrics.",
+                    "directory": {
                       "type": "string",
                       "x-order": 3
+                    }
+                  },
+                  "x-order": 1
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 0
+                },
+                "message": {
+                  "type": "string",
+                  "x-order": 1
+                },
+                "details": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "@type": {
+                        "type": "string",
+                        "x-order": 0
+                      }
                     },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
-                      "x-order": 4
-                    },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation. Uses sslmode=required instead of verify-full.",
-                      "type": "boolean",
-                      "x-order": 5
+                    "additionalProperties": false
+                  },
+                  "x-order": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/inventory/Agents/Add": {
+      "post": {
+        "description": "Adds an Agent to Inventory. Only one top-level parameter should be passed.",
+        "tags": [
+          "AgentsService"
+        ],
+        "summary": "Add an Agent to Inventory",
+        "operationId": "AddAgent",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "pmm_agent": {
+                  "type": "object",
+                  "properties": {
+                    "runs_on_node_id": {
+                      "description": "Node identifier where this instance runs.",
+                      "type": "string",
+                      "x-order": 0
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -6859,17 +6981,31 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 6
+                      "x-order": 1
+                    }
+                  },
+                  "x-order": 0
+                },
+                "node_exporter": {
+                  "type": "object",
+                  "properties": {
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 0
                     },
-                    "skip_connection_check": {
-                      "description": "Skip connection check.",
-                      "type": "boolean",
-                      "x-order": 7
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
+                      "x-order": 1
                     },
                     "push_metrics": {
                       "description": "Enables push metrics mode for exporter.",
                       "type": "boolean",
-                      "x-order": 8
+                      "x-order": 2
                     },
                     "disable_collectors": {
                       "description": "List of collector names to disable in this exporter.",
@@ -6877,27 +7013,7 @@
                       "items": {
                         "type": "string"
                       },
-                      "x-order": 9
-                    },
-                    "tls_ca": {
-                      "description": "TLS CA certificate.",
-                      "type": "string",
-                      "x-order": 10
-                    },
-                    "tls_cert": {
-                      "description": "TLS Certifcate.",
-                      "type": "string",
-                      "x-order": 11
-                    },
-                    "tls_key": {
-                      "description": "TLS Certificate Key.",
-                      "type": "string",
-                      "x-order": 12
-                    },
-                    "agent_password": {
-                      "description": "Custom password for exporter endpoint /metrics.",
-                      "type": "string",
-                      "x-order": 13
+                      "x-order": 3
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -6912,23 +7028,17 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 14
-                    },
-                    "auto_discovery_limit": {
-                      "description": "Limit of databases for auto-discovery.",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 15
+                      "x-order": 4
                     },
                     "expose_exporter": {
                       "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 16
+                      "title": "Expose the node_exporter process on all public interfaces",
+                      "x-order": 5
                     }
                   },
-                  "x-order": 4
+                  "x-order": 1
                 },
-                "proxysql_exporter": {
+                "mysqld_exporter": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -6942,12 +7052,12 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "ProxySQL username for scraping metrics.",
+                      "description": "MySQL username for scraping metrics.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "ProxySQL password for scraping metrics.",
+                      "description": "MySQL password for scraping metrics.",
                       "type": "string",
                       "x-order": 3
                     },
@@ -6961,23 +7071,44 @@
                       "type": "boolean",
                       "x-order": 5
                     },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 6
+                    },
+                    "tls_cert": {
+                      "description": "Client certificate.",
+                      "type": "string",
+                      "x-order": 7
+                    },
+                    "tls_key": {
+                      "description": "Password for decrypting tls_cert.",
+                      "type": "string",
+                      "x-order": 8
+                    },
+                    "tablestats_group_table_limit": {
+                      "description": "Tablestats group collectors will be disabled if there are more than that number of tables.\n0 means tablestats group collectors are always enabled (no limit).\nNegative value means tablestats group collectors are always disabled.",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 9
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 6
+                      "x-order": 10
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 7
+                      "x-order": 11
                     },
                     "push_metrics": {
                       "description": "Enables push metrics mode for exporter.",
                       "type": "boolean",
-                      "x-order": 8
+                      "x-order": 12
                     },
                     "disable_collectors": {
                       "description": "List of collector names to disable in this exporter.",
@@ -6985,12 +7116,12 @@
                       "items": {
                         "type": "string"
                       },
-                      "x-order": 9
+                      "x-order": 13
                     },
                     "agent_password": {
                       "description": "Custom password for exporter endpoint /metrics.",
                       "type": "string",
-                      "x-order": 10
+                      "x-order": 14
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7005,21 +7136,21 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 11
+                      "x-order": 15
                     },
                     "expose_exporter": {
                       "type": "boolean",
                       "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 12
+                      "x-order": 16
                     }
                   },
-                  "x-order": 5
+                  "x-order": 2
                 },
-                "external_exporter": {
+                "mongodb_exporter": {
                   "type": "object",
                   "properties": {
-                    "runs_on_node_id": {
-                      "description": "The node identifier where this instance is run.",
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
                       "type": "string",
                       "x-order": 0
                     },
@@ -7029,97 +7160,94 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "HTTP basic auth username for collecting metrics.",
+                      "description": "MongoDB username for scraping metrics.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "HTTP basic auth password for collecting metrics.",
+                      "description": "MongoDB password for scraping metrics.",
                       "type": "string",
                       "x-order": 3
                     },
-                    "scheme": {
-                      "description": "Scheme to generate URI to exporter metrics endpoints(default: http).",
-                      "type": "string",
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
                       "x-order": 4
                     },
-                    "metrics_path": {
-                      "description": "Path under which metrics are exposed, used to generate URI(default: /metrics).",
-                      "type": "string",
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation.",
+                      "type": "boolean",
                       "x-order": 5
                     },
-                    "listen_port": {
-                      "description": "Listen port for scraping metrics.",
-                      "type": "integer",
-                      "format": "int64",
+                    "tls_certificate_key": {
+                      "description": "Client certificate and key.",
+                      "type": "string",
                       "x-order": 6
                     },
+                    "tls_certificate_key_file_password": {
+                      "description": "Password for decrypting tls_certificate_key.",
+                      "type": "string",
+                      "x-order": 7
+                    },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 8
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 7
+                      "x-order": 9
+                    },
+                    "skip_connection_check": {
+                      "description": "Skip connection check.",
+                      "type": "boolean",
+                      "x-order": 10
                     },
                     "push_metrics": {
                       "description": "Enables push metrics mode for exporter.",
                       "type": "boolean",
-                      "x-order": 8
-                    }
-                  },
-                  "x-order": 6
-                },
-                "rds_exporter": {
-                  "type": "object",
-                  "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
-                      "type": "string",
-                      "x-order": 0
+                      "x-order": 11
                     },
-                    "node_id": {
-                      "description": "Node identifier.",
+                    "disable_collectors": {
+                      "description": "List of collector names to disable in this exporter.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 12
+                    },
+                    "authentication_mechanism": {
+                      "description": "Authentication mechanism.\nSee https://docs.mongodb.com/manual/reference/connection-string/#mongodb-urioption-urioption.authMechanism\nfor details.",
                       "type": "string",
-                      "x-order": 1
+                      "x-order": 13
                     },
-                    "aws_access_key": {
-                      "description": "AWS Access Key.",
+                    "authentication_database": {
+                      "description": "Authentication database.",
                       "type": "string",
-                      "x-order": 2
+                      "x-order": 14
                     },
-                    "aws_secret_key": {
-                      "description": "AWS Secret Key.",
+                    "agent_password": {
+                      "description": "Custom password for exporter endpoint /metrics.",
                       "type": "string",
-                      "x-order": 3
+                      "x-order": 15
                     },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
+                    "stats_collections": {
+                      "type": "array",
+                      "title": "List of colletions to get stats from. Can use *",
+                      "items": {
                         "type": "string"
                       },
-                      "x-order": 4
-                    },
-                    "skip_connection_check": {
-                      "description": "Skip connection check.",
-                      "type": "boolean",
-                      "x-order": 5
-                    },
-                    "disable_basic_metrics": {
-                      "description": "Disable basic metrics.",
-                      "type": "boolean",
-                      "x-order": 6
-                    },
-                    "disable_enhanced_metrics": {
-                      "description": "Disable enhanced metrics.",
-                      "type": "boolean",
-                      "x-order": 7
+                      "x-order": 16
                     },
-                    "push_metrics": {
-                      "description": "Enables push metrics mode for exporter.",
-                      "type": "boolean",
-                      "x-order": 8
+                    "collections_limit": {
+                      "type": "integer",
+                      "format": "int32",
+                      "title": "Collections limit. Only get Databases and collection stats if the total number of collections in the server\nis less than this value. 0: no limit",
+                      "x-order": 17
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7134,12 +7262,17 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 9
+                      "x-order": 18
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 19
                     }
                   },
-                  "x-order": 7
+                  "x-order": 3
                 },
-                "azure_database_exporter": {
+                "postgres_exporter": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -7147,78 +7280,107 @@
                       "type": "string",
                       "x-order": 0
                     },
-                    "node_id": {
-                      "description": "Node identifier.",
+                    "service_id": {
+                      "description": "Service identifier.",
                       "type": "string",
                       "x-order": 1
                     },
-                    "azure_client_id": {
+                    "username": {
+                      "description": "PostgreSQL username for scraping metrics.",
                       "type": "string",
-                      "title": "Azure client ID",
                       "x-order": 2
                     },
-                    "azure_client_secret": {
+                    "password": {
+                      "description": "PostgreSQL password for scraping metrics.",
                       "type": "string",
-                      "title": "Azure client secret",
                       "x-order": 3
                     },
-                    "azure_tenant_id": {
-                      "type": "string",
-                      "title": "Azure tanant ID",
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
                       "x-order": 4
                     },
-                    "azure_subscription_id": {
-                      "type": "string",
-                      "title": "Azure subscription ID",
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation. Uses sslmode=required instead of verify-full.",
+                      "type": "boolean",
                       "x-order": 5
                     },
-                    "azure_resource_group": {
-                      "description": "Azure resource group.",
-                      "type": "string",
-                      "x-order": 6
-                    },
-                    "azure_database_resource_type": {
-                      "type": "string",
-                      "title": "Azure resource type (mysql, maria, postgres)",
-                      "x-order": 7
-                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 8
+                      "x-order": 6
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 9
+                      "x-order": 7
                     },
                     "push_metrics": {
                       "description": "Enables push metrics mode for exporter.",
                       "type": "boolean",
-                      "x-order": 10
+                      "x-order": 8
                     },
-                    "log_level": {
-                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
-                      "type": "string",
-                      "title": "Log level for exporters",
-                      "default": "LOG_LEVEL_UNSPECIFIED",
-                      "enum": [
-                        "LOG_LEVEL_UNSPECIFIED",
-                        "LOG_LEVEL_FATAL",
+                    "disable_collectors": {
+                      "description": "List of collector names to disable in this exporter.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 9
+                    },
+                    "tls_ca": {
+                      "description": "TLS CA certificate.",
+                      "type": "string",
+                      "x-order": 10
+                    },
+                    "tls_cert": {
+                      "description": "TLS Certifcate.",
+                      "type": "string",
+                      "x-order": 11
+                    },
+                    "tls_key": {
+                      "description": "TLS Certificate Key.",
+                      "type": "string",
+                      "x-order": 12
+                    },
+                    "agent_password": {
+                      "description": "Custom password for exporter endpoint /metrics.",
+                      "type": "string",
+                      "x-order": 13
+                    },
+                    "log_level": {
+                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
+                      "type": "string",
+                      "title": "Log level for exporters",
+                      "default": "LOG_LEVEL_UNSPECIFIED",
+                      "enum": [
+                        "LOG_LEVEL_UNSPECIFIED",
+                        "LOG_LEVEL_FATAL",
                         "LOG_LEVEL_ERROR",
                         "LOG_LEVEL_WARN",
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 11
+                      "x-order": 14
+                    },
+                    "auto_discovery_limit": {
+                      "description": "Limit of databases for auto-discovery.",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 15
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 16
                     }
                   },
-                  "x-order": 8
+                  "x-order": 4
                 },
-                "qan_mysql_perfschema_agent": {
+                "proxysql_exporter": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -7232,12 +7394,12 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "MySQL username for getting performance data.",
+                      "description": "ProxySQL username for scraping metrics.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "MySQL password for getting performance data.",
+                      "description": "ProxySQL password for scraping metrics.",
                       "type": "string",
                       "x-order": 3
                     },
@@ -7251,49 +7413,36 @@
                       "type": "boolean",
                       "x-order": 5
                     },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
-                      "x-order": 6
-                    },
-                    "tls_cert": {
-                      "description": "Client certificate.",
-                      "type": "string",
-                      "x-order": 7
-                    },
-                    "tls_key": {
-                      "description": "Password for decrypting tls_cert.",
-                      "type": "string",
-                      "x-order": 8
-                    },
-                    "max_query_length": {
-                      "type": "integer",
-                      "format": "int32",
-                      "title": "Limit query length in QAN (default: server-defined; -1: no limit)",
-                      "x-order": 9
-                    },
-                    "disable_query_examples": {
-                      "description": "Disable query examples.",
-                      "type": "boolean",
-                      "x-order": 10
-                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 11
+                      "x-order": 6
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 12
+                      "x-order": 7
                     },
-                    "disable_comments_parsing": {
-                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                    "push_metrics": {
+                      "description": "Enables push metrics mode for exporter.",
                       "type": "boolean",
-                      "x-order": 13
+                      "x-order": 8
+                    },
+                    "disable_collectors": {
+                      "description": "List of collector names to disable in this exporter.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 9
+                    },
+                    "agent_password": {
+                      "description": "Custom password for exporter endpoint /metrics.",
+                      "type": "string",
+                      "x-order": 10
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7308,16 +7457,21 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 14
+                      "x-order": 11
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 12
                     }
                   },
-                  "x-order": 9
+                  "x-order": 5
                 },
-                "qan_mysql_slowlog_agent": {
+                "external_exporter": {
                   "type": "object",
                   "properties": {
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
+                    "runs_on_node_id": {
+                      "description": "The node identifier where this instance is run.",
                       "type": "string",
                       "x-order": 0
                     },
@@ -7327,56 +7481,69 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "MySQL username for getting slowlog data.",
+                      "description": "HTTP basic auth username for collecting metrics.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "MySQL password for getting slowlog data.",
+                      "description": "HTTP basic auth password for collecting metrics.",
                       "type": "string",
                       "x-order": 3
                     },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
+                    "scheme": {
+                      "description": "Scheme to generate URI to exporter metrics endpoints(default: http).",
+                      "type": "string",
                       "x-order": 4
                     },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation.",
-                      "type": "boolean",
+                    "metrics_path": {
+                      "description": "Path under which metrics are exposed, used to generate URI(default: /metrics).",
+                      "type": "string",
                       "x-order": 5
                     },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
+                    "listen_port": {
+                      "description": "Listen port for scraping metrics.",
+                      "type": "integer",
+                      "format": "int64",
                       "x-order": 6
                     },
-                    "tls_cert": {
-                      "description": "Client certificate.",
-                      "type": "string",
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
                       "x-order": 7
                     },
-                    "tls_key": {
-                      "description": "Password for decrypting tls_cert.",
-                      "type": "string",
+                    "push_metrics": {
+                      "description": "Enables push metrics mode for exporter.",
+                      "type": "boolean",
                       "x-order": 8
+                    }
+                  },
+                  "x-order": 6
+                },
+                "rds_exporter": {
+                  "type": "object",
+                  "properties": {
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 0
                     },
-                    "max_query_length": {
-                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 9
+                    "node_id": {
+                      "description": "Node identifier.",
+                      "type": "string",
+                      "x-order": 1
                     },
-                    "disable_query_examples": {
-                      "description": "Disable query examples.",
-                      "type": "boolean",
-                      "x-order": 10
+                    "aws_access_key": {
+                      "description": "AWS Access Key.",
+                      "type": "string",
+                      "x-order": 2
                     },
-                    "max_slowlog_file_size": {
-                      "description": "Rotate slowlog file at this size if \u003e 0.\nUse zero or negative value to disable rotation.",
+                    "aws_secret_key": {
+                      "description": "AWS Secret Key.",
                       "type": "string",
-                      "format": "int64",
-                      "x-order": 11
+                      "x-order": 3
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -7384,17 +7551,27 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 12
+                      "x-order": 4
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 13
+                      "x-order": 5
                     },
-                    "disable_comments_parsing": {
-                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                    "disable_basic_metrics": {
+                      "description": "Disable basic metrics.",
                       "type": "boolean",
-                      "x-order": 14
+                      "x-order": 6
+                    },
+                    "disable_enhanced_metrics": {
+                      "description": "Disable enhanced metrics.",
+                      "type": "boolean",
+                      "x-order": 7
+                    },
+                    "push_metrics": {
+                      "description": "Enables push metrics mode for exporter.",
+                      "type": "boolean",
+                      "x-order": 8
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7409,12 +7586,12 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 15
+                      "x-order": 9
                     }
                   },
-                  "x-order": 10
+                  "x-order": 7
                 },
-                "qan_mongodb_profiler_agent": {
+                "azure_database_exporter": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -7422,74 +7599,58 @@
                       "type": "string",
                       "x-order": 0
                     },
-                    "service_id": {
-                      "description": "Service identifier.",
+                    "node_id": {
+                      "description": "Node identifier.",
                       "type": "string",
                       "x-order": 1
                     },
-                    "username": {
-                      "description": "MongoDB username for getting profile data.",
+                    "azure_client_id": {
                       "type": "string",
+                      "title": "Azure client ID",
                       "x-order": 2
                     },
-                    "password": {
-                      "description": "MongoDB password for getting profile data.",
+                    "azure_client_secret": {
                       "type": "string",
+                      "title": "Azure client secret",
                       "x-order": 3
                     },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
+                    "azure_tenant_id": {
+                      "type": "string",
+                      "title": "Azure tanant ID",
                       "x-order": 4
                     },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation.",
-                      "type": "boolean",
+                    "azure_subscription_id": {
+                      "type": "string",
+                      "title": "Azure subscription ID",
                       "x-order": 5
                     },
-                    "tls_certificate_key": {
-                      "description": "Client certificate and key.",
+                    "azure_resource_group": {
+                      "description": "Azure resource group.",
                       "type": "string",
                       "x-order": 6
                     },
-                    "tls_certificate_key_file_password": {
-                      "description": "Password for decrypting tls_certificate_key.",
+                    "azure_database_resource_type": {
                       "type": "string",
+                      "title": "Azure resource type (mysql, maria, postgres)",
                       "x-order": 7
                     },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
-                      "x-order": 8
-                    },
-                    "max_query_length": {
-                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 9
-                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 10
+                      "x-order": 8
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 11
-                    },
-                    "authentication_mechanism": {
-                      "description": "Authentication mechanism.\nSee https://docs.mongodb.com/manual/reference/connection-string/#mongodb-urioption-urioption.authMechanism\nfor details.",
-                      "type": "string",
-                      "x-order": 12
+                      "x-order": 9
                     },
-                    "authentication_database": {
-                      "description": "Authentication database.",
-                      "type": "string",
-                      "x-order": 13
+                    "push_metrics": {
+                      "description": "Enables push metrics mode for exporter.",
+                      "type": "boolean",
+                      "x-order": 10
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7504,12 +7665,12 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 14
+                      "x-order": 11
                     }
                   },
-                  "x-order": 11
+                  "x-order": 8
                 },
-                "qan_postgresql_pgstatements_agent": {
+                "qan_mysql_perfschema_agent": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -7523,12 +7684,12 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "PostgreSQL username for getting pg stat statements data.",
+                      "description": "MySQL username for getting performance data.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "PostgreSQL password for getting pg stat statements data.",
+                      "description": "MySQL password for getting performance data.",
                       "type": "string",
                       "x-order": 3
                     },
@@ -7542,45 +7703,50 @@
                       "type": "boolean",
                       "x-order": 5
                     },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
                       "x-order": 6
                     },
-                    "skip_connection_check": {
-                      "description": "Skip connection check.",
-                      "type": "boolean",
+                    "tls_cert": {
+                      "description": "Client certificate.",
+                      "type": "string",
                       "x-order": 7
                     },
-                    "disable_comments_parsing": {
-                      "description": "Disable parsing comments from queries and showing them in QAN.",
-                      "type": "boolean",
+                    "tls_key": {
+                      "description": "Password for decrypting tls_cert.",
+                      "type": "string",
                       "x-order": 8
                     },
                     "max_query_length": {
-                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
                       "type": "integer",
                       "format": "int32",
+                      "title": "Limit query length in QAN (default: server-defined; -1: no limit)",
                       "x-order": 9
                     },
-                    "tls_ca": {
-                      "description": "TLS CA certificate.",
-                      "type": "string",
+                    "disable_query_examples": {
+                      "description": "Disable query examples.",
+                      "type": "boolean",
                       "x-order": 10
                     },
-                    "tls_cert": {
-                      "description": "TLS Certifcate.",
-                      "type": "string",
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
                       "x-order": 11
                     },
-                    "tls_key": {
-                      "description": "TLS Certificate Key.",
-                      "type": "string",
+                    "skip_connection_check": {
+                      "description": "Skip connection check.",
+                      "type": "boolean",
                       "x-order": 12
                     },
+                    "disable_comments_parsing": {
+                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                      "type": "boolean",
+                      "x-order": 13
+                    },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
                       "type": "string",
@@ -7594,12 +7760,12 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 13
+                      "x-order": 14
                     }
                   },
-                  "x-order": 12
+                  "x-order": 9
                 },
-                "qan_postgresql_pgstatmonitor_agent": {
+                "qan_mysql_slowlog_agent": {
                   "type": "object",
                   "properties": {
                     "pmm_agent_id": {
@@ -7613,12 +7779,12 @@
                       "x-order": 1
                     },
                     "username": {
-                      "description": "PostgreSQL username for getting pg stat monitor data.",
+                      "description": "MySQL username for getting slowlog data.",
                       "type": "string",
                       "x-order": 2
                     },
                     "password": {
-                      "description": "PostgreSQL password for getting pg stat monitor data.",
+                      "description": "MySQL password for getting slowlog data.",
                       "type": "string",
                       "x-order": 3
                     },
@@ -7632,16 +7798,37 @@
                       "type": "boolean",
                       "x-order": 5
                     },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 6
+                    },
+                    "tls_cert": {
+                      "description": "Client certificate.",
+                      "type": "string",
+                      "x-order": 7
+                    },
+                    "tls_key": {
+                      "description": "Password for decrypting tls_cert.",
+                      "type": "string",
+                      "x-order": 8
+                    },
                     "max_query_length": {
                       "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
                       "type": "integer",
                       "format": "int32",
-                      "x-order": 6
+                      "x-order": 9
                     },
                     "disable_query_examples": {
                       "description": "Disable query examples.",
                       "type": "boolean",
-                      "x-order": 7
+                      "x-order": 10
+                    },
+                    "max_slowlog_file_size": {
+                      "description": "Rotate slowlog file at this size if \u003e 0.\nUse zero or negative value to disable rotation.",
+                      "type": "string",
+                      "format": "int64",
+                      "x-order": 11
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -7649,32 +7836,17 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 8
+                      "x-order": 12
                     },
                     "skip_connection_check": {
                       "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 9
+                      "x-order": 13
                     },
                     "disable_comments_parsing": {
                       "description": "Disable parsing comments from queries and showing them in QAN.",
                       "type": "boolean",
-                      "x-order": 10
-                    },
-                    "tls_ca": {
-                      "description": "TLS CA certificate.",
-                      "type": "string",
-                      "x-order": 11
-                    },
-                    "tls_cert": {
-                      "description": "TLS Certifcate.",
-                      "type": "string",
-                      "x-order": 12
-                    },
-                    "tls_key": {
-                      "description": "TLS Certificate Key.",
-                      "type": "string",
-                      "x-order": 13
+                      "x-order": 14
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7689,74 +7861,64 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 14
+                      "x-order": 15
                     }
                   },
-                  "x-order": 13
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "pmm_agent": {
-                  "description": "PMMAgent runs on Generic or Container Node.",
+                  "x-order": 10
+                },
+                "qan_mongodb_profiler_agent": {
                   "type": "object",
                   "properties": {
-                    "agent_id": {
-                      "description": "Unique randomly generated instance identifier.",
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
                       "type": "string",
                       "x-order": 0
                     },
-                    "runs_on_node_id": {
-                      "description": "Node identifier where this instance runs.",
+                    "service_id": {
+                      "description": "Service identifier.",
                       "type": "string",
                       "x-order": 1
                     },
-                    "custom_labels": {
-                      "description": "Custom user-assigned labels.",
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      },
+                    "username": {
+                      "description": "MongoDB username for getting profile data.",
+                      "type": "string",
                       "x-order": 2
                     },
-                    "connected": {
-                      "description": "True if Agent is running and connected to pmm-managed.",
-                      "type": "boolean",
+                    "password": {
+                      "description": "MongoDB password for getting profile data.",
+                      "type": "string",
                       "x-order": 3
                     },
-                    "process_exec_path": {
-                      "description": "Path to exec process.",
-                      "type": "string",
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
                       "x-order": 4
-                    }
-                  },
-                  "x-order": 0
-                },
-                "node_exporter": {
-                  "description": "NodeExporter runs on Generic or Container Node and exposes its metrics.",
-                  "type": "object",
-                  "properties": {
-                    "agent_id": {
-                      "description": "Unique randomly generated instance identifier.",
+                    },
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation.",
+                      "type": "boolean",
+                      "x-order": 5
+                    },
+                    "tls_certificate_key": {
+                      "description": "Client certificate and key.",
                       "type": "string",
-                      "x-order": 0
+                      "x-order": 6
                     },
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
+                    "tls_certificate_key_file_password": {
+                      "description": "Password for decrypting tls_certificate_key.",
                       "type": "string",
-                      "x-order": 1
+                      "x-order": 7
                     },
-                    "disabled": {
-                      "description": "Desired Agent status: enabled (false) or disabled (true).",
-                      "type": "boolean",
-                      "x-order": 2
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 8
+                    },
+                    "max_query_length": {
+                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 9
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -7764,46 +7926,22 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 3
+                      "x-order": 10
                     },
-                    "push_metrics_enabled": {
-                      "description": "True if exporter uses push metrics mode.",
+                    "skip_connection_check": {
+                      "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 4
+                      "x-order": 11
                     },
-                    "disabled_collectors": {
-                      "description": "List of disabled collector names.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      },
-                      "x-order": 5
+                    "authentication_mechanism": {
+                      "description": "Authentication mechanism.\nSee https://docs.mongodb.com/manual/reference/connection-string/#mongodb-urioption-urioption.authMechanism\nfor details.",
+                      "type": "string",
+                      "x-order": 12
                     },
-                    "status": {
-                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
+                    "authentication_database": {
+                      "description": "Authentication database.",
                       "type": "string",
-                      "default": "AGENT_STATUS_UNSPECIFIED",
-                      "enum": [
-                        "AGENT_STATUS_UNSPECIFIED",
-                        "AGENT_STATUS_STARTING",
-                        "AGENT_STATUS_RUNNING",
-                        "AGENT_STATUS_WAITING",
-                        "AGENT_STATUS_STOPPING",
-                        "AGENT_STATUS_DONE",
-                        "AGENT_STATUS_UNKNOWN"
-                      ],
-                      "x-order": 6
-                    },
-                    "listen_port": {
-                      "description": "Listen port for scraping metrics.",
-                      "type": "integer",
-                      "format": "int64",
-                      "x-order": 7
-                    },
-                    "process_exec_path": {
-                      "description": "Path to exec process.",
-                      "type": "string",
-                      "x-order": 8
+                      "x-order": 13
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7818,75 +7956,43 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 9
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 10
+                      "x-order": 14
                     }
                   },
-                  "x-order": 1
+                  "x-order": 11
                 },
-                "mysqld_exporter": {
-                  "description": "MySQLdExporter runs on Generic or Container Node and exposes MySQL Service metrics.",
+                "qan_postgresql_pgstatements_agent": {
                   "type": "object",
                   "properties": {
-                    "agent_id": {
-                      "description": "Unique randomly generated instance identifier.",
-                      "type": "string",
-                      "x-order": 0
-                    },
                     "pmm_agent_id": {
                       "description": "The pmm-agent identifier which runs this instance.",
                       "type": "string",
-                      "x-order": 1
-                    },
-                    "disabled": {
-                      "description": "Desired Agent status: enabled (false) or disabled (true).",
-                      "type": "boolean",
-                      "x-order": 2
+                      "x-order": 0
                     },
                     "service_id": {
                       "description": "Service identifier.",
                       "type": "string",
-                      "x-order": 3
+                      "x-order": 1
                     },
                     "username": {
-                      "description": "MySQL username for scraping metrics.",
+                      "description": "PostgreSQL username for getting pg stat statements data.",
                       "type": "string",
-                      "x-order": 4
+                      "x-order": 2
+                    },
+                    "password": {
+                      "description": "PostgreSQL password for getting pg stat statements data.",
+                      "type": "string",
+                      "x-order": 3
                     },
                     "tls": {
                       "description": "Use TLS for database connections.",
                       "type": "boolean",
-                      "x-order": 5
+                      "x-order": 4
                     },
                     "tls_skip_verify": {
                       "description": "Skip TLS certificate and hostname validation.",
                       "type": "boolean",
-                      "x-order": 6
-                    },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
-                      "x-order": 7
-                    },
-                    "tls_cert": {
-                      "description": "Client certificate.",
-                      "type": "string",
-                      "x-order": 8
-                    },
-                    "tls_key": {
-                      "description": "Password for decrypting tls_cert.",
-                      "type": "string",
-                      "x-order": 9
-                    },
-                    "tablestats_group_table_limit": {
-                      "description": "Tablestats group collectors are disabled if there are more than that number of tables.\n0 means tablestats group collectors are always enabled (no limit).\nNegative value means tablestats group collectors are always disabled.",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 10
+                      "x-order": 5
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -7894,57 +8000,38 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 11
+                      "x-order": 6
                     },
-                    "push_metrics_enabled": {
-                      "description": "True if exporter uses push metrics mode.",
+                    "skip_connection_check": {
+                      "description": "Skip connection check.",
                       "type": "boolean",
-                      "x-order": 12
+                      "x-order": 7
                     },
-                    "disabled_collectors": {
-                      "description": "List of disabled collector names.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      },
-                      "x-order": 13
+                    "disable_comments_parsing": {
+                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                      "type": "boolean",
+                      "x-order": 8
                     },
-                    "table_count": {
-                      "description": "Actual table count at the moment of adding.",
+                    "max_query_length": {
+                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
                       "type": "integer",
                       "format": "int32",
-                      "x-order": 14
+                      "x-order": 9
                     },
-                    "status": {
-                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
+                    "tls_ca": {
+                      "description": "TLS CA certificate.",
                       "type": "string",
-                      "default": "AGENT_STATUS_UNSPECIFIED",
-                      "enum": [
-                        "AGENT_STATUS_UNSPECIFIED",
-                        "AGENT_STATUS_STARTING",
-                        "AGENT_STATUS_RUNNING",
-                        "AGENT_STATUS_WAITING",
-                        "AGENT_STATUS_STOPPING",
-                        "AGENT_STATUS_DONE",
-                        "AGENT_STATUS_UNKNOWN"
-                      ],
-                      "x-order": 15
-                    },
-                    "listen_port": {
-                      "description": "Listen port for scraping metrics.",
-                      "type": "integer",
-                      "format": "int64",
-                      "x-order": 16
+                      "x-order": 10
                     },
-                    "tablestats_group_disabled": {
-                      "description": "True if tablestats group collectors are currently disabled.",
-                      "type": "boolean",
-                      "x-order": 17
+                    "tls_cert": {
+                      "description": "TLS Certifcate.",
+                      "type": "string",
+                      "x-order": 11
                     },
-                    "process_exec_path": {
-                      "description": "Path to exec process.",
+                    "tls_key": {
+                      "description": "TLS Certificate Key.",
                       "type": "string",
-                      "x-order": 18
+                      "x-order": 12
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -7959,120 +8046,87 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 19
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 20
+                      "x-order": 13
                     }
                   },
-                  "x-order": 2
+                  "x-order": 12
                 },
-                "mongodb_exporter": {
-                  "description": "MongoDBExporter runs on Generic or Container Node and exposes MongoDB Service metrics.",
+                "qan_postgresql_pgstatmonitor_agent": {
                   "type": "object",
                   "properties": {
-                    "agent_id": {
-                      "description": "Unique randomly generated instance identifier.",
-                      "type": "string",
-                      "x-order": 0
-                    },
                     "pmm_agent_id": {
                       "description": "The pmm-agent identifier which runs this instance.",
                       "type": "string",
-                      "x-order": 1
-                    },
-                    "disabled": {
-                      "description": "Desired Agent status: enabled (false) or disabled (true).",
-                      "type": "boolean",
-                      "x-order": 2
+                      "x-order": 0
                     },
                     "service_id": {
                       "description": "Service identifier.",
                       "type": "string",
-                      "x-order": 3
+                      "x-order": 1
                     },
                     "username": {
-                      "description": "MongoDB username for scraping metrics.",
+                      "description": "PostgreSQL username for getting pg stat monitor data.",
                       "type": "string",
-                      "x-order": 4
+                      "x-order": 2
+                    },
+                    "password": {
+                      "description": "PostgreSQL password for getting pg stat monitor data.",
+                      "type": "string",
+                      "x-order": 3
                     },
                     "tls": {
                       "description": "Use TLS for database connections.",
                       "type": "boolean",
-                      "x-order": 5
+                      "x-order": 4
                     },
                     "tls_skip_verify": {
                       "description": "Skip TLS certificate and hostname validation.",
                       "type": "boolean",
+                      "x-order": 5
+                    },
+                    "max_query_length": {
+                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
+                      "type": "integer",
+                      "format": "int32",
                       "x-order": 6
                     },
+                    "disable_query_examples": {
+                      "description": "Disable query examples.",
+                      "type": "boolean",
+                      "x-order": 7
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 7
-                    },
-                    "push_metrics_enabled": {
-                      "description": "True if exporter uses push metrics mode.",
-                      "type": "boolean",
                       "x-order": 8
                     },
-                    "disabled_collectors": {
-                      "description": "List of disabled collector names.",
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      },
+                    "skip_connection_check": {
+                      "description": "Skip connection check.",
+                      "type": "boolean",
                       "x-order": 9
                     },
-                    "status": {
-                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
-                      "type": "string",
-                      "default": "AGENT_STATUS_UNSPECIFIED",
-                      "enum": [
-                        "AGENT_STATUS_UNSPECIFIED",
-                        "AGENT_STATUS_STARTING",
-                        "AGENT_STATUS_RUNNING",
-                        "AGENT_STATUS_WAITING",
-                        "AGENT_STATUS_STOPPING",
-                        "AGENT_STATUS_DONE",
-                        "AGENT_STATUS_UNKNOWN"
-                      ],
+                    "disable_comments_parsing": {
+                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                      "type": "boolean",
                       "x-order": 10
                     },
-                    "listen_port": {
-                      "description": "Listen port for scraping metrics.",
-                      "type": "integer",
-                      "format": "int64",
+                    "tls_ca": {
+                      "description": "TLS CA certificate.",
+                      "type": "string",
                       "x-order": 11
                     },
-                    "stats_collections": {
-                      "type": "array",
-                      "title": "List of colletions to get stats from. Can use *",
-                      "items": {
-                        "type": "string"
-                      },
+                    "tls_cert": {
+                      "description": "TLS Certifcate.",
+                      "type": "string",
                       "x-order": 12
                     },
-                    "collections_limit": {
-                      "type": "integer",
-                      "format": "int32",
-                      "title": "Collections limit. Only get Databases and collection stats if the total number of collections in the server\nis less than this value. 0: no limit",
-                      "x-order": 13
-                    },
-                    "enable_all_collectors": {
-                      "description": "Enable All collectors.",
-                      "type": "boolean",
-                      "x-order": 14
-                    },
-                    "process_exec_path": {
-                      "description": "Path to exec process.",
+                    "tls_key": {
+                      "description": "TLS Certificate Key.",
                       "type": "string",
-                      "x-order": 15
+                      "x-order": 13
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8087,18 +8141,23 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 16
-                    },
-                    "expose_exporter": {
-                      "type": "boolean",
-                      "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 17
+                      "x-order": 14
                     }
                   },
-                  "x-order": 3
-                },
-                "postgres_exporter": {
-                  "description": "PostgresExporter runs on Generic or Container Node and exposes PostgreSQL Service metrics.",
+                  "x-order": 13
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "pmm_agent": {
+                  "description": "PMMAgent runs on Generic or Container Node.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8106,35 +8165,50 @@
                       "type": "string",
                       "x-order": 0
                     },
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
+                    "runs_on_node_id": {
+                      "description": "Node identifier where this instance runs.",
                       "type": "string",
                       "x-order": 1
                     },
-                    "disabled": {
-                      "description": "Desired Agent status: enabled (false) or disabled (true).",
-                      "type": "boolean",
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
                       "x-order": 2
                     },
-                    "service_id": {
-                      "description": "Service identifier.",
-                      "type": "string",
+                    "connected": {
+                      "description": "True if Agent is running and connected to pmm-managed.",
+                      "type": "boolean",
                       "x-order": 3
                     },
-                    "username": {
-                      "description": "PostgreSQL username for scraping metrics.",
+                    "process_exec_path": {
+                      "description": "Path to exec process.",
                       "type": "string",
                       "x-order": 4
+                    }
+                  },
+                  "x-order": 0
+                },
+                "node_exporter": {
+                  "description": "NodeExporter runs on Generic or Container Node and exposes its metrics.",
+                  "type": "object",
+                  "properties": {
+                    "agent_id": {
+                      "description": "Unique randomly generated instance identifier.",
+                      "type": "string",
+                      "x-order": 0
                     },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
-                      "x-order": 5
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 1
                     },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation. Uses sslmode=required instead of verify-full.",
+                    "disabled": {
+                      "description": "Desired Agent status: enabled (false) or disabled (true).",
                       "type": "boolean",
-                      "x-order": 6
+                      "x-order": 2
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -8142,12 +8216,12 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 7
+                      "x-order": 3
                     },
                     "push_metrics_enabled": {
                       "description": "True if exporter uses push metrics mode.",
                       "type": "boolean",
-                      "x-order": 8
+                      "x-order": 4
                     },
                     "disabled_collectors": {
                       "description": "List of disabled collector names.",
@@ -8155,7 +8229,7 @@
                       "items": {
                         "type": "string"
                       },
-                      "x-order": 9
+                      "x-order": 5
                     },
                     "status": {
                       "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
@@ -8170,18 +8244,18 @@
                         "AGENT_STATUS_DONE",
                         "AGENT_STATUS_UNKNOWN"
                       ],
-                      "x-order": 10
+                      "x-order": 6
                     },
                     "listen_port": {
                       "description": "Listen port for scraping metrics.",
                       "type": "integer",
                       "format": "int64",
-                      "x-order": 11
+                      "x-order": 7
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 12
+                      "x-order": 8
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8196,24 +8270,18 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 13
-                    },
-                    "auto_discovery_limit": {
-                      "description": "Limit of databases for auto-discovery.",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 14
+                      "x-order": 9
                     },
                     "expose_exporter": {
                       "type": "boolean",
                       "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 15
+                      "x-order": 10
                     }
                   },
-                  "x-order": 4
+                  "x-order": 1
                 },
-                "proxysql_exporter": {
-                  "description": "ProxySQLExporter runs on Generic or Container Node and exposes ProxySQL Service metrics.",
+                "mysqld_exporter": {
+                  "description": "MySQLdExporter runs on Generic or Container Node and exposes MySQL Service metrics.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8237,7 +8305,7 @@
                       "x-order": 3
                     },
                     "username": {
-                      "description": "ProxySQL username for scraping metrics.",
+                      "description": "MySQL username for scraping metrics.",
                       "type": "string",
                       "x-order": 4
                     },
@@ -8251,18 +8319,39 @@
                       "type": "boolean",
                       "x-order": 6
                     },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 7
+                    },
+                    "tls_cert": {
+                      "description": "Client certificate.",
+                      "type": "string",
+                      "x-order": 8
+                    },
+                    "tls_key": {
+                      "description": "Password for decrypting tls_cert.",
+                      "type": "string",
+                      "x-order": 9
+                    },
+                    "tablestats_group_table_limit": {
+                      "description": "Tablestats group collectors are disabled if there are more than that number of tables.\n0 means tablestats group collectors are always enabled (no limit).\nNegative value means tablestats group collectors are always disabled.",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 10
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 7
+                      "x-order": 11
                     },
                     "push_metrics_enabled": {
                       "description": "True if exporter uses push metrics mode.",
                       "type": "boolean",
-                      "x-order": 8
+                      "x-order": 12
                     },
                     "disabled_collectors": {
                       "description": "List of disabled collector names.",
@@ -8270,7 +8359,13 @@
                       "items": {
                         "type": "string"
                       },
-                      "x-order": 9
+                      "x-order": 13
+                    },
+                    "table_count": {
+                      "description": "Actual table count at the moment of adding.",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 14
                     },
                     "status": {
                       "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
@@ -8285,18 +8380,23 @@
                         "AGENT_STATUS_DONE",
                         "AGENT_STATUS_UNKNOWN"
                       ],
-                      "x-order": 10
+                      "x-order": 15
                     },
                     "listen_port": {
                       "description": "Listen port for scraping metrics.",
                       "type": "integer",
                       "format": "int64",
-                      "x-order": 11
+                      "x-order": 16
+                    },
+                    "tablestats_group_disabled": {
+                      "description": "True if tablestats group collectors are currently disabled.",
+                      "type": "boolean",
+                      "x-order": 17
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 12
+                      "x-order": 18
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8311,18 +8411,18 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 13
+                      "x-order": 19
                     },
                     "expose_exporter": {
                       "type": "boolean",
                       "title": "Optionally expose the exporter process on all public interfaces",
-                      "x-order": 14
+                      "x-order": 20
                     }
                   },
-                  "x-order": 5
+                  "x-order": 2
                 },
-                "external_exporter": {
-                  "description": "ExternalExporter runs on any Node type, including Remote Node.",
+                "mongodb_exporter": {
+                  "description": "MongoDBExporter runs on Generic or Container Node and exposes MongoDB Service metrics.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8330,13 +8430,13 @@
                       "type": "string",
                       "x-order": 0
                     },
-                    "runs_on_node_id": {
-                      "description": "Node identifier where this instance runs.",
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
                       "type": "string",
                       "x-order": 1
                     },
                     "disabled": {
-                      "description": "If disabled, metrics from this exporter will not be collected.",
+                      "description": "Desired Agent status: enabled (false) or disabled (true).",
                       "type": "boolean",
                       "x-order": 2
                     },
@@ -8346,18 +8446,18 @@
                       "x-order": 3
                     },
                     "username": {
-                      "description": "HTTP basic auth username for collecting metrics.",
+                      "description": "MongoDB username for scraping metrics.",
                       "type": "string",
                       "x-order": 4
                     },
-                    "scheme": {
-                      "description": "Scheme to generate URI to exporter metrics endpoints.",
-                      "type": "string",
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
                       "x-order": 5
                     },
-                    "metrics_path": {
-                      "description": "Path under which metrics are exposed, used to generate URI.",
-                      "type": "string",
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation.",
+                      "type": "boolean",
                       "x-order": 6
                     },
                     "custom_labels": {
@@ -8368,27 +8468,89 @@
                       },
                       "x-order": 7
                     },
+                    "push_metrics_enabled": {
+                      "description": "True if exporter uses push metrics mode.",
+                      "type": "boolean",
+                      "x-order": 8
+                    },
+                    "disabled_collectors": {
+                      "description": "List of disabled collector names.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 9
+                    },
+                    "status": {
+                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
+                      "type": "string",
+                      "default": "AGENT_STATUS_UNSPECIFIED",
+                      "enum": [
+                        "AGENT_STATUS_UNSPECIFIED",
+                        "AGENT_STATUS_STARTING",
+                        "AGENT_STATUS_RUNNING",
+                        "AGENT_STATUS_WAITING",
+                        "AGENT_STATUS_STOPPING",
+                        "AGENT_STATUS_DONE",
+                        "AGENT_STATUS_UNKNOWN"
+                      ],
+                      "x-order": 10
+                    },
                     "listen_port": {
                       "description": "Listen port for scraping metrics.",
                       "type": "integer",
                       "format": "int64",
-                      "x-order": 8
+                      "x-order": 11
                     },
-                    "push_metrics_enabled": {
-                      "description": "True if exporter uses push metrics mode.",
+                    "stats_collections": {
+                      "type": "array",
+                      "title": "List of colletions to get stats from. Can use *",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 12
+                    },
+                    "collections_limit": {
+                      "type": "integer",
+                      "format": "int32",
+                      "title": "Collections limit. Only get Databases and collection stats if the total number of collections in the server\nis less than this value. 0: no limit",
+                      "x-order": 13
+                    },
+                    "enable_all_collectors": {
+                      "description": "Enable All collectors.",
                       "type": "boolean",
-                      "x-order": 9
+                      "x-order": 14
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 10
+                      "x-order": 15
+                    },
+                    "log_level": {
+                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
+                      "type": "string",
+                      "title": "Log level for exporters",
+                      "default": "LOG_LEVEL_UNSPECIFIED",
+                      "enum": [
+                        "LOG_LEVEL_UNSPECIFIED",
+                        "LOG_LEVEL_FATAL",
+                        "LOG_LEVEL_ERROR",
+                        "LOG_LEVEL_WARN",
+                        "LOG_LEVEL_INFO",
+                        "LOG_LEVEL_DEBUG"
+                      ],
+                      "x-order": 16
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 17
                     }
                   },
-                  "x-order": 6
+                  "x-order": 3
                 },
-                "rds_exporter": {
-                  "description": "RDSExporter runs on Generic or Container Node and exposes RemoteRDS Node metrics.",
+                "postgres_exporter": {
+                  "description": "PostgresExporter runs on Generic or Container Node and exposes PostgreSQL Service metrics.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8406,23 +8568,46 @@
                       "type": "boolean",
                       "x-order": 2
                     },
-                    "node_id": {
-                      "description": "Node identifier.",
+                    "service_id": {
+                      "description": "Service identifier.",
                       "type": "string",
                       "x-order": 3
                     },
-                    "aws_access_key": {
-                      "description": "AWS Access Key.",
-                      "type": "string",
+                    "username": {
+                      "description": "PostgreSQL username for scraping metrics.",
+                      "type": "string",
                       "x-order": 4
                     },
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
+                      "x-order": 5
+                    },
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation. Uses sslmode=required instead of verify-full.",
+                      "type": "boolean",
+                      "x-order": 6
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 5
+                      "x-order": 7
+                    },
+                    "push_metrics_enabled": {
+                      "description": "True if exporter uses push metrics mode.",
+                      "type": "boolean",
+                      "x-order": 8
+                    },
+                    "disabled_collectors": {
+                      "description": "List of disabled collector names.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 9
                     },
                     "status": {
                       "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
@@ -8437,33 +8622,18 @@
                         "AGENT_STATUS_DONE",
                         "AGENT_STATUS_UNKNOWN"
                       ],
-                      "x-order": 6
+                      "x-order": 10
                     },
                     "listen_port": {
-                      "description": "Listen port for scraping metrics (the same for several configurations).",
+                      "description": "Listen port for scraping metrics.",
                       "type": "integer",
                       "format": "int64",
-                      "x-order": 7
-                    },
-                    "basic_metrics_disabled": {
-                      "description": "Basic metrics are disabled.",
-                      "type": "boolean",
-                      "x-order": 8
-                    },
-                    "enhanced_metrics_disabled": {
-                      "description": "Enhanced metrics are disabled.",
-                      "type": "boolean",
-                      "x-order": 9
-                    },
-                    "push_metrics_enabled": {
-                      "description": "True if exporter uses push metrics mode.",
-                      "type": "boolean",
-                      "x-order": 10
+                      "x-order": 11
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 11
+                      "x-order": 12
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8478,19 +8648,24 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 12
+                      "x-order": 13
                     },
                     "auto_discovery_limit": {
                       "description": "Limit of databases for auto-discovery.",
                       "type": "integer",
                       "format": "int32",
-                      "x-order": 13
+                      "x-order": 14
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 15
                     }
                   },
-                  "x-order": 7
+                  "x-order": 4
                 },
-                "azure_database_exporter": {
-                  "description": "AzureDatabaseExporter runs on Generic or Container Node and exposes RemoteAzure Node metrics.",
+                "proxysql_exporter": {
+                  "description": "ProxySQLExporter runs on Generic or Container Node and exposes ProxySQL Service metrics.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8508,28 +8683,46 @@
                       "type": "boolean",
                       "x-order": 2
                     },
-                    "node_id": {
-                      "description": "Node identifier.",
+                    "service_id": {
+                      "description": "Service identifier.",
                       "type": "string",
                       "x-order": 3
                     },
-                    "azure_database_subscription_id": {
-                      "description": "Azure database subscription ID.",
+                    "username": {
+                      "description": "ProxySQL username for scraping metrics.",
                       "type": "string",
                       "x-order": 4
                     },
-                    "azure_database_resource_type": {
-                      "type": "string",
-                      "title": "Azure database resource type (mysql, maria, postgres)",
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
                       "x-order": 5
                     },
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation.",
+                      "type": "boolean",
+                      "x-order": 6
+                    },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
                       "type": "object",
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 6
+                      "x-order": 7
+                    },
+                    "push_metrics_enabled": {
+                      "description": "True if exporter uses push metrics mode.",
+                      "type": "boolean",
+                      "x-order": 8
+                    },
+                    "disabled_collectors": {
+                      "description": "List of disabled collector names.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      },
+                      "x-order": 9
                     },
                     "status": {
                       "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
@@ -8544,23 +8737,18 @@
                         "AGENT_STATUS_DONE",
                         "AGENT_STATUS_UNKNOWN"
                       ],
-                      "x-order": 7
+                      "x-order": 10
                     },
                     "listen_port": {
-                      "description": "Listen port for scraping metrics (the same for several configurations).",
+                      "description": "Listen port for scraping metrics.",
                       "type": "integer",
                       "format": "int64",
-                      "x-order": 8
-                    },
-                    "push_metrics_enabled": {
-                      "description": "True if the exporter operates in push metrics mode.",
-                      "type": "boolean",
-                      "x-order": 9
+                      "x-order": 11
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 10
+                      "x-order": 12
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8575,13 +8763,18 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 11
+                      "x-order": 13
+                    },
+                    "expose_exporter": {
+                      "type": "boolean",
+                      "title": "Optionally expose the exporter process on all public interfaces",
+                      "x-order": 14
                     }
                   },
-                  "x-order": 8
+                  "x-order": 5
                 },
-                "qan_mysql_perfschema_agent": {
-                  "description": "QANMySQLPerfSchemaAgent runs within pmm-agent and sends MySQL Query Analytics data to the PMM Server.",
+                "external_exporter": {
+                  "description": "ExternalExporter runs on any Node type, including Remote Node.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8589,13 +8782,13 @@
                       "type": "string",
                       "x-order": 0
                     },
-                    "pmm_agent_id": {
-                      "description": "The pmm-agent identifier which runs this instance.",
+                    "runs_on_node_id": {
+                      "description": "Node identifier where this instance runs.",
                       "type": "string",
                       "x-order": 1
                     },
                     "disabled": {
-                      "description": "Desired Agent status: enabled (false) or disabled (true).",
+                      "description": "If disabled, metrics from this exporter will not be collected.",
                       "type": "boolean",
                       "x-order": 2
                     },
@@ -8605,50 +8798,75 @@
                       "x-order": 3
                     },
                     "username": {
-                      "description": "MySQL username for getting performance data.",
+                      "description": "HTTP basic auth username for collecting metrics.",
                       "type": "string",
                       "x-order": 4
                     },
-                    "tls": {
-                      "description": "Use TLS for database connections.",
-                      "type": "boolean",
+                    "scheme": {
+                      "description": "Scheme to generate URI to exporter metrics endpoints.",
+                      "type": "string",
                       "x-order": 5
                     },
-                    "tls_skip_verify": {
-                      "description": "Skip TLS certificate and hostname validation.",
-                      "type": "boolean",
+                    "metrics_path": {
+                      "description": "Path under which metrics are exposed, used to generate URI.",
+                      "type": "string",
                       "x-order": 6
                     },
-                    "tls_ca": {
-                      "description": "Certificate Authority certificate chain.",
-                      "type": "string",
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
                       "x-order": 7
                     },
-                    "tls_cert": {
-                      "description": "Client certificate.",
-                      "type": "string",
+                    "listen_port": {
+                      "description": "Listen port for scraping metrics.",
+                      "type": "integer",
+                      "format": "int64",
                       "x-order": 8
                     },
-                    "tls_key": {
-                      "description": "Password for decrypting tls_cert.",
-                      "type": "string",
+                    "push_metrics_enabled": {
+                      "description": "True if exporter uses push metrics mode.",
+                      "type": "boolean",
                       "x-order": 9
                     },
-                    "disable_comments_parsing": {
-                      "description": "Disable parsing comments from queries and showing them in QAN.",
-                      "type": "boolean",
+                    "process_exec_path": {
+                      "description": "Path to exec process.",
+                      "type": "string",
                       "x-order": 10
+                    }
+                  },
+                  "x-order": 6
+                },
+                "rds_exporter": {
+                  "description": "RDSExporter runs on Generic or Container Node and exposes RemoteRDS Node metrics.",
+                  "type": "object",
+                  "properties": {
+                    "agent_id": {
+                      "description": "Unique randomly generated instance identifier.",
+                      "type": "string",
+                      "x-order": 0
                     },
-                    "max_query_length": {
-                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
-                      "type": "integer",
-                      "format": "int32",
-                      "x-order": 11
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 1
                     },
-                    "query_examples_disabled": {
-                      "description": "True if query examples are disabled.",
+                    "disabled": {
+                      "description": "Desired Agent status: enabled (false) or disabled (true).",
                       "type": "boolean",
-                      "x-order": 12
+                      "x-order": 2
+                    },
+                    "node_id": {
+                      "description": "Node identifier.",
+                      "type": "string",
+                      "x-order": 3
+                    },
+                    "aws_access_key": {
+                      "description": "AWS Access Key.",
+                      "type": "string",
+                      "x-order": 4
                     },
                     "custom_labels": {
                       "description": "Custom user-assigned labels.",
@@ -8656,7 +8874,7 @@
                       "additionalProperties": {
                         "type": "string"
                       },
-                      "x-order": 13
+                      "x-order": 5
                     },
                     "status": {
                       "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
@@ -8671,12 +8889,33 @@
                         "AGENT_STATUS_DONE",
                         "AGENT_STATUS_UNKNOWN"
                       ],
-                      "x-order": 14
+                      "x-order": 6
+                    },
+                    "listen_port": {
+                      "description": "Listen port for scraping metrics (the same for several configurations).",
+                      "type": "integer",
+                      "format": "int64",
+                      "x-order": 7
+                    },
+                    "basic_metrics_disabled": {
+                      "description": "Basic metrics are disabled.",
+                      "type": "boolean",
+                      "x-order": 8
+                    },
+                    "enhanced_metrics_disabled": {
+                      "description": "Enhanced metrics are disabled.",
+                      "type": "boolean",
+                      "x-order": 9
+                    },
+                    "push_metrics_enabled": {
+                      "description": "True if exporter uses push metrics mode.",
+                      "type": "boolean",
+                      "x-order": 10
                     },
                     "process_exec_path": {
                       "description": "Path to exec process.",
                       "type": "string",
-                      "x-order": 15
+                      "x-order": 11
                     },
                     "log_level": {
                       "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
@@ -8691,13 +8930,19 @@
                         "LOG_LEVEL_INFO",
                         "LOG_LEVEL_DEBUG"
                       ],
-                      "x-order": 16
+                      "x-order": 12
+                    },
+                    "auto_discovery_limit": {
+                      "description": "Limit of databases for auto-discovery.",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 13
                     }
                   },
-                  "x-order": 9
+                  "x-order": 7
                 },
-                "qan_mysql_slowlog_agent": {
-                  "description": "QANMySQLSlowlogAgent runs within pmm-agent and sends MySQL Query Analytics data to the PMM Server.",
+                "azure_database_exporter": {
+                  "description": "AzureDatabaseExporter runs on Generic or Container Node and exposes RemoteAzure Node metrics.",
                   "type": "object",
                   "properties": {
                     "agent_id": {
@@ -8715,8 +8960,215 @@
                       "type": "boolean",
                       "x-order": 2
                     },
-                    "service_id": {
-                      "description": "Service identifier.",
+                    "node_id": {
+                      "description": "Node identifier.",
+                      "type": "string",
+                      "x-order": 3
+                    },
+                    "azure_database_subscription_id": {
+                      "description": "Azure database subscription ID.",
+                      "type": "string",
+                      "x-order": 4
+                    },
+                    "azure_database_resource_type": {
+                      "type": "string",
+                      "title": "Azure database resource type (mysql, maria, postgres)",
+                      "x-order": 5
+                    },
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
+                      "x-order": 6
+                    },
+                    "status": {
+                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
+                      "type": "string",
+                      "default": "AGENT_STATUS_UNSPECIFIED",
+                      "enum": [
+                        "AGENT_STATUS_UNSPECIFIED",
+                        "AGENT_STATUS_STARTING",
+                        "AGENT_STATUS_RUNNING",
+                        "AGENT_STATUS_WAITING",
+                        "AGENT_STATUS_STOPPING",
+                        "AGENT_STATUS_DONE",
+                        "AGENT_STATUS_UNKNOWN"
+                      ],
+                      "x-order": 7
+                    },
+                    "listen_port": {
+                      "description": "Listen port for scraping metrics (the same for several configurations).",
+                      "type": "integer",
+                      "format": "int64",
+                      "x-order": 8
+                    },
+                    "push_metrics_enabled": {
+                      "description": "True if the exporter operates in push metrics mode.",
+                      "type": "boolean",
+                      "x-order": 9
+                    },
+                    "process_exec_path": {
+                      "description": "Path to exec process.",
+                      "type": "string",
+                      "x-order": 10
+                    },
+                    "log_level": {
+                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
+                      "type": "string",
+                      "title": "Log level for exporters",
+                      "default": "LOG_LEVEL_UNSPECIFIED",
+                      "enum": [
+                        "LOG_LEVEL_UNSPECIFIED",
+                        "LOG_LEVEL_FATAL",
+                        "LOG_LEVEL_ERROR",
+                        "LOG_LEVEL_WARN",
+                        "LOG_LEVEL_INFO",
+                        "LOG_LEVEL_DEBUG"
+                      ],
+                      "x-order": 11
+                    }
+                  },
+                  "x-order": 8
+                },
+                "qan_mysql_perfschema_agent": {
+                  "description": "QANMySQLPerfSchemaAgent runs within pmm-agent and sends MySQL Query Analytics data to the PMM Server.",
+                  "type": "object",
+                  "properties": {
+                    "agent_id": {
+                      "description": "Unique randomly generated instance identifier.",
+                      "type": "string",
+                      "x-order": 0
+                    },
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 1
+                    },
+                    "disabled": {
+                      "description": "Desired Agent status: enabled (false) or disabled (true).",
+                      "type": "boolean",
+                      "x-order": 2
+                    },
+                    "service_id": {
+                      "description": "Service identifier.",
+                      "type": "string",
+                      "x-order": 3
+                    },
+                    "username": {
+                      "description": "MySQL username for getting performance data.",
+                      "type": "string",
+                      "x-order": 4
+                    },
+                    "tls": {
+                      "description": "Use TLS for database connections.",
+                      "type": "boolean",
+                      "x-order": 5
+                    },
+                    "tls_skip_verify": {
+                      "description": "Skip TLS certificate and hostname validation.",
+                      "type": "boolean",
+                      "x-order": 6
+                    },
+                    "tls_ca": {
+                      "description": "Certificate Authority certificate chain.",
+                      "type": "string",
+                      "x-order": 7
+                    },
+                    "tls_cert": {
+                      "description": "Client certificate.",
+                      "type": "string",
+                      "x-order": 8
+                    },
+                    "tls_key": {
+                      "description": "Password for decrypting tls_cert.",
+                      "type": "string",
+                      "x-order": 9
+                    },
+                    "disable_comments_parsing": {
+                      "description": "Disable parsing comments from queries and showing them in QAN.",
+                      "type": "boolean",
+                      "x-order": 10
+                    },
+                    "max_query_length": {
+                      "description": "Limit query length in QAN (default: server-defined; -1: no limit).",
+                      "type": "integer",
+                      "format": "int32",
+                      "x-order": 11
+                    },
+                    "query_examples_disabled": {
+                      "description": "True if query examples are disabled.",
+                      "type": "boolean",
+                      "x-order": 12
+                    },
+                    "custom_labels": {
+                      "description": "Custom user-assigned labels.",
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "string"
+                      },
+                      "x-order": 13
+                    },
+                    "status": {
+                      "description": "AgentStatus represents actual Agent status.\n\n - AGENT_STATUS_STARTING: Agent is starting.\n - AGENT_STATUS_RUNNING: Agent is running.\n - AGENT_STATUS_WAITING: Agent encountered error and will be restarted automatically soon.\n - AGENT_STATUS_STOPPING: Agent is stopping.\n - AGENT_STATUS_DONE: Agent finished.\n - AGENT_STATUS_UNKNOWN: Agent is not connected, we don't know anything about it's state.",
+                      "type": "string",
+                      "default": "AGENT_STATUS_UNSPECIFIED",
+                      "enum": [
+                        "AGENT_STATUS_UNSPECIFIED",
+                        "AGENT_STATUS_STARTING",
+                        "AGENT_STATUS_RUNNING",
+                        "AGENT_STATUS_WAITING",
+                        "AGENT_STATUS_STOPPING",
+                        "AGENT_STATUS_DONE",
+                        "AGENT_STATUS_UNKNOWN"
+                      ],
+                      "x-order": 14
+                    },
+                    "process_exec_path": {
+                      "description": "Path to exec process.",
+                      "type": "string",
+                      "x-order": 15
+                    },
+                    "log_level": {
+                      "description": "- LOG_LEVEL_UNSPECIFIED: Auto",
+                      "type": "string",
+                      "title": "Log level for exporters",
+                      "default": "LOG_LEVEL_UNSPECIFIED",
+                      "enum": [
+                        "LOG_LEVEL_UNSPECIFIED",
+                        "LOG_LEVEL_FATAL",
+                        "LOG_LEVEL_ERROR",
+                        "LOG_LEVEL_WARN",
+                        "LOG_LEVEL_INFO",
+                        "LOG_LEVEL_DEBUG"
+                      ],
+                      "x-order": 16
+                    }
+                  },
+                  "x-order": 9
+                },
+                "qan_mysql_slowlog_agent": {
+                  "description": "QANMySQLSlowlogAgent runs within pmm-agent and sends MySQL Query Analytics data to the PMM Server.",
+                  "type": "object",
+                  "properties": {
+                    "agent_id": {
+                      "description": "Unique randomly generated instance identifier.",
+                      "type": "string",
+                      "x-order": 0
+                    },
+                    "pmm_agent_id": {
+                      "description": "The pmm-agent identifier which runs this instance.",
+                      "type": "string",
+                      "x-order": 1
+                    },
+                    "disabled": {
+                      "description": "Desired Agent status: enabled (false) or disabled (true).",
+                      "type": "boolean",
+                      "x-order": 2
+                    },
+                    "service_id": {
+                      "description": "Service identifier.",
                       "type": "string",
                       "x-order": 3
                     },
@@ -26370,470 +26822,37 @@
                               "description": "Agent version.",
                               "type": "string",
                               "x-order": 37
-                            },
-                            "is_connected": {
-                              "description": "True if Agent is running and connected to pmm-managed.",
-                              "type": "boolean",
-                              "x-order": 38
-                            },
-                            "expose_exporter": {
-                              "description": "True if an exporter agent is exposed on all host addresses.",
-                              "type": "boolean",
-                              "x-order": 39
-                            }
-                          }
-                        },
-                        "x-order": 16
-                      },
-                      "status": {
-                        "description": "Service status.\n\n - STATUS_UNSPECIFIED: In case we don't support the db vendor yet.\n - STATUS_UP: The service is up.\n - STATUS_DOWN: The service is down.\n - STATUS_UNKNOWN: The service's status cannot be known (e.g. there are no metrics yet).",
-                        "type": "string",
-                        "default": "STATUS_UNSPECIFIED",
-                        "enum": [
-                          "STATUS_UNSPECIFIED",
-                          "STATUS_UP",
-                          "STATUS_DOWN",
-                          "STATUS_UNKNOWN"
-                        ],
-                        "x-order": 17
-                      },
-                      "version": {
-                        "description": "The service/database version.",
-                        "type": "string",
-                        "x-order": 18
-                      }
-                    }
-                  },
-                  "x-order": 0
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "code": {
-                  "type": "integer",
-                  "format": "int32",
-                  "x-order": 0
-                },
-                "message": {
-                  "type": "string",
-                  "x-order": 1
-                },
-                "details": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "@type": {
-                        "type": "string",
-                        "x-order": 0
-                      }
-                    },
-                    "additionalProperties": false
-                  },
-                  "x-order": 2
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/v1/management/Service/Remove": {
-      "post": {
-        "description": "Removes a Service along with Agents.",
-        "tags": [
-          "Service"
-        ],
-        "summary": "Remove Service",
-        "operationId": "RemoveServiceMixin3",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "service_type": {
-                  "description": "ServiceType describes supported Service types.",
-                  "type": "string",
-                  "default": "SERVICE_TYPE_UNSPECIFIED",
-                  "enum": [
-                    "SERVICE_TYPE_UNSPECIFIED",
-                    "SERVICE_TYPE_MYSQL_SERVICE",
-                    "SERVICE_TYPE_MONGODB_SERVICE",
-                    "SERVICE_TYPE_POSTGRESQL_SERVICE",
-                    "SERVICE_TYPE_PROXYSQL_SERVICE",
-                    "SERVICE_TYPE_HAPROXY_SERVICE",
-                    "SERVICE_TYPE_EXTERNAL_SERVICE"
-                  ],
-                  "x-order": 0
-                },
-                "service_id": {
-                  "description": "Service ID or Service Name is required.\nUnique randomly generated instance identifier.",
-                  "type": "string",
-                  "x-order": 1
-                },
-                "service_name": {
-                  "description": "Unique across all Services user-defined name.",
-                  "type": "string",
-                  "x-order": 2
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "type": "object"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "code": {
-                  "type": "integer",
-                  "format": "int32",
-                  "x-order": 0
-                },
-                "message": {
-                  "type": "string",
-                  "x-order": 1
-                },
-                "details": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "@type": {
-                        "type": "string",
-                        "x-order": 0
-                      }
-                    },
-                    "additionalProperties": false
-                  },
-                  "x-order": 2
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/v1/management/azure/AzureDatabase/Add": {
-      "post": {
-        "tags": [
-          "AzureDatabaseService"
-        ],
-        "summary": "AddAzureDatabase adds Azure Database instance.",
-        "operationId": "AddAzureDatabase",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "region": {
-                  "description": "Azure database location.",
-                  "type": "string",
-                  "x-order": 0
-                },
-                "az": {
-                  "description": "Azure database availability zone.",
-                  "type": "string",
-                  "x-order": 1
-                },
-                "instance_id": {
-                  "description": "Azure database instance ID.",
-                  "type": "string",
-                  "x-order": 2
-                },
-                "node_model": {
-                  "description": "Represents a purchasable Stock Keeping Unit (SKU) under a product.\nhttps://docs.microsoft.com/en-us/partner-center/develop/product-resources#sku.",
-                  "type": "string",
-                  "x-order": 3
-                },
-                "address": {
-                  "description": "Address used to connect to it.",
-                  "type": "string",
-                  "x-order": 4
-                },
-                "port": {
-                  "description": "Access port.",
-                  "type": "integer",
-                  "format": "int64",
-                  "x-order": 5
-                },
-                "node_name": {
-                  "description": "Unique across all Nodes user-defined name. Defaults to Azure Database instance ID.",
-                  "type": "string",
-                  "x-order": 6
-                },
-                "service_name": {
-                  "description": "Unique across all Services user-defined name. Defaults to Azure Database instance ID.",
-                  "type": "string",
-                  "x-order": 7
-                },
-                "environment": {
-                  "description": "Environment name.",
-                  "type": "string",
-                  "x-order": 8
-                },
-                "username": {
-                  "description": "Username for scraping metrics.",
-                  "type": "string",
-                  "x-order": 9
-                },
-                "password": {
-                  "description": "Password for scraping metrics.",
-                  "type": "string",
-                  "x-order": 10
-                },
-                "azure_client_id": {
-                  "description": "Azure client ID.",
-                  "type": "string",
-                  "x-order": 11
-                },
-                "azure_client_secret": {
-                  "description": "Azure client secret.",
-                  "type": "string",
-                  "x-order": 12
-                },
-                "azure_tenant_id": {
-                  "description": "Azure tanant ID.",
-                  "type": "string",
-                  "x-order": 13
-                },
-                "azure_subscription_id": {
-                  "description": "Azure subscription ID.",
-                  "type": "string",
-                  "x-order": 14
-                },
-                "azure_resource_group": {
-                  "description": "Azure resource group.",
-                  "type": "string",
-                  "x-order": 15
-                },
-                "azure_database_exporter": {
-                  "description": "If true, adds azure_database_exporter.",
-                  "type": "boolean",
-                  "x-order": 16
-                },
-                "qan": {
-                  "description": "If true, adds qan-mysql-perfschema-agent or qan-postgresql-pgstatements-agent.",
-                  "type": "boolean",
-                  "x-order": 17
-                },
-                "custom_labels": {
-                  "description": "Custom user-assigned labels for Node and Service.",
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "string"
-                  },
-                  "x-order": 18
-                },
-                "skip_connection_check": {
-                  "description": "Skip connection check.",
-                  "type": "boolean",
-                  "x-order": 19
-                },
-                "tls": {
-                  "description": "Use TLS for database connections.",
-                  "type": "boolean",
-                  "x-order": 20
-                },
-                "tls_skip_verify": {
-                  "description": "Skip TLS certificate and hostname validation.",
-                  "type": "boolean",
-                  "x-order": 21
-                },
-                "disable_query_examples": {
-                  "description": "Disable query examples.",
-                  "type": "boolean",
-                  "x-order": 22
-                },
-                "tablestats_group_table_limit": {
-                  "description": "Tablestats group collectors will be disabled if there are more than that number of tables.\nIf zero, server's default value is used.\nUse negative value to disable them.",
-                  "type": "integer",
-                  "format": "int32",
-                  "x-order": 23
-                },
-                "type": {
-                  "description": "DiscoverAzureDatabaseType describes supported Azure Database instance engines.\n\n - DISCOVER_AZURE_DATABASE_TYPE_MYSQL: MySQL type: microsoft.dbformysql or MariaDB type: microsoft.dbformariadb\n - DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL: PostgreSQL type: microsoft.dbformysql",
-                  "type": "string",
-                  "default": "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
-                  "enum": [
-                    "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
-                    "DISCOVER_AZURE_DATABASE_TYPE_MYSQL",
-                    "DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL"
-                  ],
-                  "x-order": 24
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "type": "object"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "code": {
-                  "type": "integer",
-                  "format": "int32",
-                  "x-order": 0
-                },
-                "message": {
-                  "type": "string",
-                  "x-order": 1
-                },
-                "details": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "@type": {
-                        "type": "string",
-                        "x-order": 0
-                      }
-                    },
-                    "additionalProperties": false
-                  },
-                  "x-order": 2
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/v1/management/azure/AzureDatabase/Discover": {
-      "post": {
-        "tags": [
-          "AzureDatabaseService"
-        ],
-        "summary": "DiscoverAzureDatabase discovers Azure Database for MySQL, MariaDB and PostgreSQL Server instances.",
-        "operationId": "DiscoverAzureDatabase",
-        "parameters": [
-          {
-            "description": "DiscoverAzureDatabaseRequest discover azure databases request.",
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "description": "DiscoverAzureDatabaseRequest discover azure databases request.",
-              "type": "object",
-              "properties": {
-                "azure_client_id": {
-                  "description": "Azure client ID.",
-                  "type": "string",
-                  "x-order": 0
-                },
-                "azure_client_secret": {
-                  "description": "Azure client secret.",
-                  "type": "string",
-                  "x-order": 1
-                },
-                "azure_tenant_id": {
-                  "description": "Azure tanant ID.",
-                  "type": "string",
-                  "x-order": 2
-                },
-                "azure_subscription_id": {
-                  "description": "Azure subscription ID.",
-                  "type": "string",
-                  "x-order": 3
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "description": "DiscoverAzureDatabaseResponse discover azure databases response.",
-              "type": "object",
-              "properties": {
-                "azure_database_instance": {
-                  "type": "array",
-                  "items": {
-                    "description": "DiscoverAzureDatabaseInstance models an unique Azure Database instance for the list of instances returned by Discovery.",
-                    "type": "object",
-                    "properties": {
-                      "instance_id": {
-                        "description": "Azure database instance ID.",
-                        "type": "string",
-                        "x-order": 0
-                      },
-                      "region": {
-                        "description": "Azure database location.",
-                        "type": "string",
-                        "x-order": 1
-                      },
-                      "service_name": {
-                        "description": "Azure database server name.",
-                        "type": "string",
-                        "x-order": 2
-                      },
-                      "username": {
-                        "description": "Database username.",
-                        "type": "string",
-                        "x-order": 3
-                      },
-                      "address": {
-                        "description": "Address used to connect to it.",
-                        "type": "string",
-                        "x-order": 4
-                      },
-                      "azure_resource_group": {
-                        "description": "Azure Resource group.",
-                        "type": "string",
-                        "x-order": 5
-                      },
-                      "environment": {
-                        "description": "Environment tag.",
-                        "type": "string",
-                        "x-order": 6
+                            },
+                            "is_connected": {
+                              "description": "True if Agent is running and connected to pmm-managed.",
+                              "type": "boolean",
+                              "x-order": 38
+                            },
+                            "expose_exporter": {
+                              "description": "True if an exporter agent is exposed on all host addresses.",
+                              "type": "boolean",
+                              "x-order": 39
+                            }
+                          }
+                        },
+                        "x-order": 16
                       },
-                      "type": {
-                        "description": "DiscoverAzureDatabaseType describes supported Azure Database instance engines.\n\n - DISCOVER_AZURE_DATABASE_TYPE_MYSQL: MySQL type: microsoft.dbformysql or MariaDB type: microsoft.dbformariadb\n - DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL: PostgreSQL type: microsoft.dbformysql",
+                      "status": {
+                        "description": "Service status.\n\n - STATUS_UNSPECIFIED: In case we don't support the db vendor yet.\n - STATUS_UP: The service is up.\n - STATUS_DOWN: The service is down.\n - STATUS_UNKNOWN: The service's status cannot be known (e.g. there are no metrics yet).",
                         "type": "string",
-                        "default": "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
+                        "default": "STATUS_UNSPECIFIED",
                         "enum": [
-                          "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
-                          "DISCOVER_AZURE_DATABASE_TYPE_MYSQL",
-                          "DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL"
+                          "STATUS_UNSPECIFIED",
+                          "STATUS_UP",
+                          "STATUS_DOWN",
+                          "STATUS_UNKNOWN"
                         ],
-                        "x-order": 7
-                      },
-                      "az": {
-                        "description": "Azure database availability zone.",
-                        "type": "string",
-                        "x-order": 8
+                        "x-order": 17
                       },
-                      "node_model": {
-                        "description": "Represents a purchasable Stock Keeping Unit (SKU) under a product.\nhttps://docs.microsoft.com/en-us/partner-center/develop/product-resources#sku.",
+                      "version": {
+                        "description": "The service/database version.",
                         "type": "string",
-                        "x-order": 9
+                        "x-order": 18
                       }
                     }
                   },
@@ -26876,13 +26895,14 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/Delete": {
+    "/v1/management/Service/Remove": {
       "post": {
+        "description": "Removes a Service along with Agents.",
         "tags": [
-          "DumpsService"
+          "Service"
         ],
-        "summary": "DeleteDump deletes specified pmm dump.",
-        "operationId": "DeleteDump",
+        "summary": "Remove Service",
+        "operationId": "RemoveServiceMixin3",
         "parameters": [
           {
             "name": "body",
@@ -26891,12 +26911,30 @@
             "schema": {
               "type": "object",
               "properties": {
-                "dump_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  },
+                "service_type": {
+                  "description": "ServiceType describes supported Service types.",
+                  "type": "string",
+                  "default": "SERVICE_TYPE_UNSPECIFIED",
+                  "enum": [
+                    "SERVICE_TYPE_UNSPECIFIED",
+                    "SERVICE_TYPE_MYSQL_SERVICE",
+                    "SERVICE_TYPE_MONGODB_SERVICE",
+                    "SERVICE_TYPE_POSTGRESQL_SERVICE",
+                    "SERVICE_TYPE_PROXYSQL_SERVICE",
+                    "SERVICE_TYPE_HAPROXY_SERVICE",
+                    "SERVICE_TYPE_EXTERNAL_SERVICE"
+                  ],
                   "x-order": 0
+                },
+                "service_id": {
+                  "description": "Service ID or Service Name is required.\nUnique randomly generated instance identifier.",
+                  "type": "string",
+                  "x-order": 1
+                },
+                "service_name": {
+                  "description": "Unique across all Services user-defined name.",
+                  "type": "string",
+                  "x-order": 2
                 }
               }
             }
@@ -26943,13 +26981,13 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/GetLogs": {
+    "/v1/management/azure/AzureDatabase/Add": {
       "post": {
         "tags": [
-          "DumpsService"
+          "AzureDatabaseService"
         ],
-        "summary": "GetLogs returns logs from pmm-dump tool.",
-        "operationId": "GetDumpLogs",
+        "summary": "AddAzureDatabase adds Azure Database instance.",
+        "operationId": "AddAzureDatabase",
         "parameters": [
           {
             "name": "body",
@@ -26958,160 +26996,151 @@
             "schema": {
               "type": "object",
               "properties": {
-                "dump_id": {
+                "region": {
+                  "description": "Azure database location.",
                   "type": "string",
                   "x-order": 0
                 },
-                "offset": {
-                  "type": "integer",
-                  "format": "int64",
+                "az": {
+                  "description": "Azure database availability zone.",
+                  "type": "string",
                   "x-order": 1
                 },
-                "limit": {
-                  "type": "integer",
-                  "format": "int64",
+                "instance_id": {
+                  "description": "Azure database instance ID.",
+                  "type": "string",
                   "x-order": 2
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "logs": {
-                  "type": "array",
-                  "items": {
-                    "description": "LogChunk represent one chunk of logs.",
-                    "type": "object",
-                    "properties": {
-                      "chunk_id": {
-                        "type": "integer",
-                        "format": "int64",
-                        "x-order": 0
-                      },
-                      "data": {
-                        "type": "string",
-                        "x-order": 1
-                      }
-                    }
-                  },
-                  "x-order": 0
                 },
-                "end": {
-                  "type": "boolean",
-                  "x-order": 1
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "code": {
+                "node_model": {
+                  "description": "Represents a purchasable Stock Keeping Unit (SKU) under a product.\nhttps://docs.microsoft.com/en-us/partner-center/develop/product-resources#sku.",
+                  "type": "string",
+                  "x-order": 3
+                },
+                "address": {
+                  "description": "Address used to connect to it.",
+                  "type": "string",
+                  "x-order": 4
+                },
+                "port": {
+                  "description": "Access port.",
                   "type": "integer",
-                  "format": "int32",
-                  "x-order": 0
+                  "format": "int64",
+                  "x-order": 5
                 },
-                "message": {
+                "node_name": {
+                  "description": "Unique across all Nodes user-defined name. Defaults to Azure Database instance ID.",
                   "type": "string",
-                  "x-order": 1
+                  "x-order": 6
                 },
-                "details": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "@type": {
-                        "type": "string",
-                        "x-order": 0
-                      }
-                    },
-                    "additionalProperties": false
+                "service_name": {
+                  "description": "Unique across all Services user-defined name. Defaults to Azure Database instance ID.",
+                  "type": "string",
+                  "x-order": 7
+                },
+                "environment": {
+                  "description": "Environment name.",
+                  "type": "string",
+                  "x-order": 8
+                },
+                "username": {
+                  "description": "Username for scraping metrics.",
+                  "type": "string",
+                  "x-order": 9
+                },
+                "password": {
+                  "description": "Password for scraping metrics.",
+                  "type": "string",
+                  "x-order": 10
+                },
+                "azure_client_id": {
+                  "description": "Azure client ID.",
+                  "type": "string",
+                  "x-order": 11
+                },
+                "azure_client_secret": {
+                  "description": "Azure client secret.",
+                  "type": "string",
+                  "x-order": 12
+                },
+                "azure_tenant_id": {
+                  "description": "Azure tanant ID.",
+                  "type": "string",
+                  "x-order": 13
+                },
+                "azure_subscription_id": {
+                  "description": "Azure subscription ID.",
+                  "type": "string",
+                  "x-order": 14
+                },
+                "azure_resource_group": {
+                  "description": "Azure resource group.",
+                  "type": "string",
+                  "x-order": 15
+                },
+                "azure_database_exporter": {
+                  "description": "If true, adds azure_database_exporter.",
+                  "type": "boolean",
+                  "x-order": 16
+                },
+                "qan": {
+                  "description": "If true, adds qan-mysql-perfschema-agent or qan-postgresql-pgstatements-agent.",
+                  "type": "boolean",
+                  "x-order": 17
+                },
+                "custom_labels": {
+                  "description": "Custom user-assigned labels for Node and Service.",
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
                   },
-                  "x-order": 2
+                  "x-order": 18
+                },
+                "skip_connection_check": {
+                  "description": "Skip connection check.",
+                  "type": "boolean",
+                  "x-order": 19
+                },
+                "tls": {
+                  "description": "Use TLS for database connections.",
+                  "type": "boolean",
+                  "x-order": 20
+                },
+                "tls_skip_verify": {
+                  "description": "Skip TLS certificate and hostname validation.",
+                  "type": "boolean",
+                  "x-order": 21
+                },
+                "disable_query_examples": {
+                  "description": "Disable query examples.",
+                  "type": "boolean",
+                  "x-order": 22
+                },
+                "tablestats_group_table_limit": {
+                  "description": "Tablestats group collectors will be disabled if there are more than that number of tables.\nIf zero, server's default value is used.\nUse negative value to disable them.",
+                  "type": "integer",
+                  "format": "int32",
+                  "x-order": 23
+                },
+                "type": {
+                  "description": "DiscoverAzureDatabaseType describes supported Azure Database instance engines.\n\n - DISCOVER_AZURE_DATABASE_TYPE_MYSQL: MySQL type: microsoft.dbformysql or MariaDB type: microsoft.dbformariadb\n - DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL: PostgreSQL type: microsoft.dbformysql",
+                  "type": "string",
+                  "default": "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
+                  "enum": [
+                    "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
+                    "DISCOVER_AZURE_DATABASE_TYPE_MYSQL",
+                    "DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL"
+                  ],
+                  "x-order": 24
                 }
               }
             }
           }
-        }
-      }
-    },
-    "/v1/management/dump/Dumps/List": {
-      "post": {
-        "tags": [
-          "DumpsService"
-        ],
-        "summary": "ListDumps returns a list of all pmm dumps.",
-        "operationId": "ListDumps",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object"
-            }
-          }
         ],
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "type": "object",
-              "properties": {
-                "dumps": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "dump_id": {
-                        "type": "string",
-                        "x-order": 0
-                      },
-                      "status": {
-                        "type": "string",
-                        "default": "DUMP_STATUS_UNSPECIFIED",
-                        "enum": [
-                          "DUMP_STATUS_UNSPECIFIED",
-                          "DUMP_STATUS_IN_PROGRESS",
-                          "DUMP_STATUS_SUCCESS",
-                          "DUMP_STATUS_ERROR"
-                        ],
-                        "x-order": 1
-                      },
-                      "service_names": {
-                        "type": "array",
-                        "items": {
-                          "type": "string"
-                        },
-                        "x-order": 2
-                      },
-                      "start_time": {
-                        "type": "string",
-                        "format": "date-time",
-                        "x-order": 3
-                      },
-                      "end_time": {
-                        "type": "string",
-                        "format": "date-time",
-                        "x-order": 4
-                      },
-                      "created_at": {
-                        "type": "string",
-                        "format": "date-time",
-                        "x-order": 5
-                      }
-                    }
-                  },
-                  "x-order": 0
-                }
-              }
+              "type": "object"
             }
           },
           "default": {
@@ -27148,45 +27177,42 @@
         }
       }
     },
-    "/v1/management/dump/Dumps/Start": {
+    "/v1/management/azure/AzureDatabase/Discover": {
       "post": {
         "tags": [
-          "DumpsService"
+          "AzureDatabaseService"
         ],
-        "summary": "StartDump request creates pmm dump.",
-        "operationId": "StartDump",
+        "summary": "DiscoverAzureDatabase discovers Azure Database for MySQL, MariaDB and PostgreSQL Server instances.",
+        "operationId": "DiscoverAzureDatabase",
         "parameters": [
           {
+            "description": "DiscoverAzureDatabaseRequest discover azure databases request.",
             "name": "body",
             "in": "body",
             "required": true,
             "schema": {
+              "description": "DiscoverAzureDatabaseRequest discover azure databases request.",
               "type": "object",
               "properties": {
-                "service_names": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  },
+                "azure_client_id": {
+                  "description": "Azure client ID.",
+                  "type": "string",
                   "x-order": 0
                 },
-                "start_time": {
+                "azure_client_secret": {
+                  "description": "Azure client secret.",
                   "type": "string",
-                  "format": "date-time",
                   "x-order": 1
                 },
-                "end_time": {
+                "azure_tenant_id": {
+                  "description": "Azure tanant ID.",
                   "type": "string",
-                  "format": "date-time",
                   "x-order": 2
                 },
-                "export_qan": {
-                  "type": "boolean",
+                "azure_subscription_id": {
+                  "description": "Azure subscription ID.",
+                  "type": "string",
                   "x-order": 3
-                },
-                "ignore_load": {
-                  "type": "boolean",
-                  "x-order": 4
                 }
               }
             }
@@ -27196,103 +27222,77 @@
           "200": {
             "description": "A successful response.",
             "schema": {
+              "description": "DiscoverAzureDatabaseResponse discover azure databases response.",
               "type": "object",
               "properties": {
-                "dump_id": {
-                  "type": "string",
-                  "x-order": 0
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "code": {
-                  "type": "integer",
-                  "format": "int32",
-                  "x-order": 0
-                },
-                "message": {
-                  "type": "string",
-                  "x-order": 1
-                },
-                "details": {
+                "azure_database_instance": {
                   "type": "array",
                   "items": {
+                    "description": "DiscoverAzureDatabaseInstance models an unique Azure Database instance for the list of instances returned by Discovery.",
                     "type": "object",
                     "properties": {
-                      "@type": {
+                      "instance_id": {
+                        "description": "Azure database instance ID.",
                         "type": "string",
                         "x-order": 0
+                      },
+                      "region": {
+                        "description": "Azure database location.",
+                        "type": "string",
+                        "x-order": 1
+                      },
+                      "service_name": {
+                        "description": "Azure database server name.",
+                        "type": "string",
+                        "x-order": 2
+                      },
+                      "username": {
+                        "description": "Database username.",
+                        "type": "string",
+                        "x-order": 3
+                      },
+                      "address": {
+                        "description": "Address used to connect to it.",
+                        "type": "string",
+                        "x-order": 4
+                      },
+                      "azure_resource_group": {
+                        "description": "Azure Resource group.",
+                        "type": "string",
+                        "x-order": 5
+                      },
+                      "environment": {
+                        "description": "Environment tag.",
+                        "type": "string",
+                        "x-order": 6
+                      },
+                      "type": {
+                        "description": "DiscoverAzureDatabaseType describes supported Azure Database instance engines.\n\n - DISCOVER_AZURE_DATABASE_TYPE_MYSQL: MySQL type: microsoft.dbformysql or MariaDB type: microsoft.dbformariadb\n - DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL: PostgreSQL type: microsoft.dbformysql",
+                        "type": "string",
+                        "default": "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
+                        "enum": [
+                          "DISCOVER_AZURE_DATABASE_TYPE_UNSPECIFIED",
+                          "DISCOVER_AZURE_DATABASE_TYPE_MYSQL",
+                          "DISCOVER_AZURE_DATABASE_TYPE_POSTGRESQL"
+                        ],
+                        "x-order": 7
+                      },
+                      "az": {
+                        "description": "Azure database availability zone.",
+                        "type": "string",
+                        "x-order": 8
+                      },
+                      "node_model": {
+                        "description": "Represents a purchasable Stock Keeping Unit (SKU) under a product.\nhttps://docs.microsoft.com/en-us/partner-center/develop/product-resources#sku.",
+                        "type": "string",
+                        "x-order": 9
                       }
-                    },
-                    "additionalProperties": false
-                  },
-                  "x-order": 2
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/v1/management/dump/Dumps/Upload": {
-      "post": {
-        "tags": [
-          "DumpsService"
-        ],
-        "summary": "UploadDump uploads selected dumps to remote server.",
-        "operationId": "UploadDump",
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "dump_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  },
-                  "x-order": 0
-                },
-                "sftp_parameters": {
-                  "type": "object",
-                  "properties": {
-                    "address": {
-                      "type": "string",
-                      "x-order": 0
-                    },
-                    "user": {
-                      "type": "string",
-                      "x-order": 1
-                    },
-                    "password": {
-                      "type": "string",
-                      "x-order": 2
-                    },
-                    "directory": {
-                      "type": "string",
-                      "x-order": 3
                     }
                   },
-                  "x-order": 1
+                  "x-order": 0
                 }
               }
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "type": "object"
-            }
           },
           "default": {
             "description": "An unexpected error response.",