remove type from deprecrated path

jakelandis · jakelandis · commit 1573aae01296 · 2019-03-11T08:19:35.000-05:00
diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java
@@ -52,10 +52,6 @@ public RestMonitoringBulkAction(Settings settings, RestController controller) {
             POST, "/_xpack/monitoring/_bulk", deprecationLogger);
         controller.registerWithDeprecatedHandler(PUT, "/_monitoring/bulk", this,
             PUT, "/_xpack/monitoring/_bulk", deprecationLogger);
-        controller.registerWithDeprecatedHandler(POST, "/_monitoring/{type}/bulk", this,
-            POST, "/_xpack/monitoring/{type}/_bulk", deprecationLogger);
-        controller.registerWithDeprecatedHandler(PUT, "/_monitoring/{type}/bulk", this,
-            PUT, "/_xpack/monitoring/{type}/_bulk", deprecationLogger);
 
         final List<String> allVersions = Arrays.asList(
                 MonitoringTemplateUtils.TEMPLATE_VERSION,
@@ -82,10 +78,6 @@ public RestChannelConsumer doPrepareRequest(RestRequest request, XPackClient cli
             throw new IllegalArgumentException("no [" + MONITORING_ID + "] for monitoring bulk request");
         }
 
-        if (Strings.isEmpty(request.param("type")) == false) {
-            throw new IllegalArgumentException("Custom types for monitoring is not supported. [" + id + "]");
-        }
-
         final String version = request.param(MONITORING_VERSION);
         if (Strings.isEmpty(version)) {
             throw new IllegalArgumentException("no [" + MONITORING_VERSION + "] for monitoring bulk request");
