From 6c9c49a7a6573704b83c8fe8c8c9353e4dcc7275 Mon Sep 17 00:00:00 2001 From: neptunian Date: Thu, 30 Apr 2020 12:53:06 -0400 Subject: [PATCH 1/4] restrict installing or updating to out-of-date package --- .../ingest_manager/server/routes/epm/handlers.ts | 6 ++++++ .../server/services/epm/packages/install.ts | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts index ad16e1dde456bc..a1406f7bd42615 100644 --- a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts +++ b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts @@ -136,6 +136,12 @@ export const installPackageHandler: RequestHandler Date: Thu, 30 Apr 2020 13:09:46 -0400 Subject: [PATCH 2/4] throw bad requests in remove handler --- config/kibana.yml | 2 +- x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts | 6 ++++++ .../ingest_manager/server/services/epm/packages/remove.ts | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/kibana.yml b/config/kibana.yml index 0780841ca057ed..b1c70c4f96907a 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -10,7 +10,7 @@ # Use the `server.rewriteBasePath` setting to tell Kibana if it should remove the basePath # from requests it receives, and to prevent a deprecation warning at startup. # This setting cannot end in a slash. -#server.basePath: "" +server.basePath: "/ssg" # Specifies whether Kibana should rewrite requests that are prefixed with # `server.basePath` or require that they are rewritten by your reverse proxy. diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts index a1406f7bd42615..fd3a9c520b90a4 100644 --- a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts +++ b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts @@ -163,6 +163,12 @@ export const deletePackageHandler: RequestHandler Date: Thu, 30 Apr 2020 13:15:19 -0400 Subject: [PATCH 3/4] remove accidental commit --- config/kibana.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kibana.yml b/config/kibana.yml index b1c70c4f96907a..de316082a00392 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -10,7 +10,7 @@ # Use the `server.rewriteBasePath` setting to tell Kibana if it should remove the basePath # from requests it receives, and to prevent a deprecation warning at startup. # This setting cannot end in a slash. -server.basePath: "/ssg" +# server.basePath: "" # Specifies whether Kibana should rewrite requests that are prefixed with # `server.basePath` or require that they are rewritten by your reverse proxy. From b0ef75d56c0568fb606e5d375243d2df5f42e1b8 Mon Sep 17 00:00:00 2001 From: neptunian Date: Thu, 30 Apr 2020 13:16:46 -0400 Subject: [PATCH 4/4] remove space --- config/kibana.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kibana.yml b/config/kibana.yml index de316082a00392..0780841ca057ed 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -10,7 +10,7 @@ # Use the `server.rewriteBasePath` setting to tell Kibana if it should remove the basePath # from requests it receives, and to prevent a deprecation warning at startup. # This setting cannot end in a slash. -# server.basePath: "" +#server.basePath: "" # Specifies whether Kibana should rewrite requests that are prefixed with # `server.basePath` or require that they are rewritten by your reverse proxy.