Revert "[deb/rpm] Generate os package specific kibana.yml (#98213) (#… (

#111966) This reverts commit 5d0065f.
elastic · Sep 14, 2021 · dc8f435 · dc8f435
1 parent 245d207
commit dc8f435
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 65 deletions.
diff --git a/src/dev/build/build_distributables.ts b/src/dev/build/build_distributables.ts
@@ -106,10 +106,6 @@ export async function buildDistributables(log: ToolingLog, options: BuildOptions
     // control w/ --skip-archives
     await run(Tasks.CreateArchives);
   }
-
-  if (options.createDebPackage || options.createRpmPackage) {
-    await run(Tasks.CreatePackageConfig);
-  }
   if (options.createDebPackage) {
     // control w/ --deb or --skip-os-packages
     await run(Tasks.CreateDebPackage);

diff --git a/src/dev/build/tasks/os_packages/create_os_package_kibana_yml.ts b/src/dev/build/tasks/os_packages/create_os_package_kibana_yml.ts
diff --git a/src/dev/build/tasks/os_packages/create_os_package_tasks.ts b/src/dev/build/tasks/os_packages/create_os_package_tasks.ts
@@ -9,15 +9,6 @@
 import { Task } from '../../lib';
 import { runFpm } from './run_fpm';
 import { runDockerGenerator } from './docker_generator';
-import { createOSPackageKibanaYML } from './create_os_package_kibana_yml';
-
-export const CreatePackageConfig: Task = {
-  description: 'Creating OS package kibana.yml',
-
-  async run(config, log, build) {
-    await createOSPackageKibanaYML(config, build);
-  },
-};
 
 export const CreateDebPackage: Task = {
   description: 'Creating deb package',

diff --git a/src/dev/build/tasks/os_packages/run_fpm.ts b/src/dev/build/tasks/os_packages/run_fpm.ts
@@ -125,7 +125,6 @@ export async function runFpm(
     `${resolveWithTrailingSlash(fromBuild('.'))}=/usr/share/kibana/`,
 
     // copy the config directory to /etc/kibana
-    `${config.resolveFromRepo('build/os_packages/config/kibana.yml')}=/etc/kibana/kibana.yml`,
     `${resolveWithTrailingSlash(fromBuild('config'))}=/etc/kibana/`,
 
     // copy the data directory at /var/lib/kibana

diff --git a/src/dev/build/tasks/os_packages/service_templates/systemd/etc/systemd/system/kibana.service b/src/dev/build/tasks/os_packages/service_templates/systemd/etc/systemd/system/kibana.service
@@ -15,7 +15,7 @@ Environment=KBN_PATH_CONF=/etc/kibana
 EnvironmentFile=-/etc/default/kibana
 EnvironmentFile=-/etc/sysconfig/kibana
 
-ExecStart=/usr/share/kibana/bin/kibana
+ExecStart=/usr/share/kibana/bin/kibana --logging.dest="/var/log/kibana/kibana.log" --pid.file="/run/kibana/kibana.pid"
 
 Restart=on-failure
 RestartSec=3