Remove X-Pack Usage API endpoint

x-pack/dev-tools/api_debug/apis/kibana_stats/index.js

@@ -5,6 +5,6 @@
  */
 
 export const name = 'kibana_stats';
-export const description = 'Get the Kibana usage stats from the Kibana server';
+export const description = 'Get the extended Kibana usage stats from the Kibana server';
 export const method = 'GET';
-export const path = '/api/_kibana/v1/stats';
+export const path = '/api/stats?extended=true';

x-pack/plugins/xpack_main/index.js

@@ -15,8 +15,6 @@ import { replaceInjectedVars } from './server/lib/replace_injected_vars';
 import { setupXPackMain } from './server/lib/setup_xpack_main';
 import {
   xpackInfoRoute,
-  xpackUsageRoute,
-  kibanaStatsRoute,
   telemetryRoute,
 } from './server/routes/api/v1';
 import {
@@ -111,8 +109,6 @@ export const xpackMain = (kibana) => {
 
       // register routes
       xpackInfoRoute(server);
-      xpackUsageRoute(server); // To replace kibanaStatsRoute
-      kibanaStatsRoute(server); // Only used internally. Remove in the next major.
       telemetryRoute(server);
     }
   });

x-pack/plugins/xpack_main/server/routes/api/v1/index.js

@@ -5,6 +5,4 @@
  */
 
 export { xpackInfoRoute } from './xpack_info';
-export { kibanaStatsRoute } from './kibana_stats';
-export { xpackUsageRoute } from './xpack_usage';
 export { telemetryRoute } from './telemetry';

x-pack/test/api_integration/apis/xpack_main/index.js

@@ -7,6 +7,5 @@
 export default function ({ loadTestFile }) {
   describe('xpack_main', () => {
     loadTestFile(require.resolve('./telemetry'));
-    loadTestFile(require.resolve('./usage'));
   });
 }

x-pack/test/api_integration/services/usage_api.js

@@ -12,26 +12,18 @@ export function UsageAPIProvider({ getService }) {
   return {
     async getUsageStatsNoAuth() {
       const { body } = await supertestNoAuth
-        .get('/api/_xpack/usage')
+        .get('/api/stats?extended=true')
         .set('kbn-xsrf', 'xxx')
         .expect(401);
-      return body;
+      return body.usage;
     },
 
     async getUsageStats() {
       const { body } = await supertest
-        .get('/api/_xpack/usage')
+        .get('/api/stats?extended=true')
         .set('kbn-xsrf', 'xxx')
         .expect(200);
-      return body;
-    },
-
-    async getUsageStatsFromDeprecatedPre64Endpoint() {
-      const { body } = await supertest
-        .get('/api/_kibana/v1/stats')
-        .set('kbn-xsrf', 'xxx')
-        .expect(200);
-      return body;
+      return body.usage;
     },
   };
 }

x-pack/test/reporting/api/usage.js

@@ -123,29 +123,5 @@ export default function ({ getService }) {
         reportingAPI.expectAllTimeJobTypeTotalStats(usage, 'printable_pdf', 23);
       });
     });
-
-    /* Have to skip this test because the usage stats returned by the legacy
-     * endpoint aren't snake_cased in the legacy usage api. This will be
-     * completely removed in the next PR, when the legacy endpoint is removed
-     */
-    describe.skip('deprecated API', () => {
-      it('shows correct stats', async () => {
-        const usage = await usageAPI.getUsageStatsFromDeprecatedPre64Endpoint();
-
-        reportingAPI.expectRecentPdfAppStats(usage, 'visualization', 2);
-        reportingAPI.expectRecentPdfAppStats(usage, 'dashboard', 2);
-        reportingAPI.expectRecentPdfLayoutStats(usage, 'preserve_layout', 2);
-        reportingAPI.expectRecentPdfLayoutStats(usage, 'print', 2);
-        reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 1);
-        reportingAPI.expectRecentJobTypeTotalStats(usage, 'printable_pdf', 4);
-
-        reportingAPI.expectAllTimePdfAppStats(usage, 'visualization', 5);
-        reportingAPI.expectAllTimePdfAppStats(usage, 'dashboard', 5);
-        reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 5);
-        reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 5);
-        reportingAPI.expectAllTimeJobTypeTotalStats(usage, 'csv', 4);
-        reportingAPI.expectAllTimeJobTypeTotalStats(usage, 'printable_pdf', 23);
-      });
-    });
   });
 }