Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] [deb/rpm] Generate os package specific kibana.yml (#98213) #110734

Merged
merged 1 commit into from
Sep 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/dev/build/build_distributables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ 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);
Expand Down
50 changes: 50 additions & 0 deletions src/dev/build/tasks/os_packages/create_os_package_kibana_yml.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { readFileSync, writeFileSync } from 'fs';
import { resolve } from 'path';
import { Build, Config, mkdirp } from '../../lib';

export async function createOSPackageKibanaYML(config: Config, build: Build) {
const configReadPath = config.resolveFromRepo('config', 'kibana.yml');
const configWriteDir = config.resolveFromRepo('build', 'os_packages', 'config');
const configWritePath = resolve(configWriteDir, 'kibana.yml');

await mkdirp(configWriteDir);

let kibanaYML = readFileSync(configReadPath, { encoding: 'utf8' });

[
[/#pid.file:.*/g, 'pid.file: /run/kibana/kibana.pid'],
[/#logging.dest:.*/g, 'logging.dest: /var/log/kibana/kibana.log'],
].forEach((options) => {
const [regex, setting] = options;
const diff = kibanaYML;
const match = kibanaYML.search(regex) >= 0;
if (match) {
if (typeof setting === 'string') {
kibanaYML = kibanaYML.replace(regex, setting);
}
}

if (!diff.localeCompare(kibanaYML)) {
throw new Error(
`OS package configuration unmodified. Verify match for ${regex} is available`
);
}
});

try {
writeFileSync(configWritePath, kibanaYML, { flag: 'wx' });
} catch (err) {
if (err.code === 'EEXIST') {
return;
}
throw err;
}
}
9 changes: 9 additions & 0 deletions src/dev/build/tasks/os_packages/create_os_package_tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
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',
Expand Down
1 change: 1 addition & 0 deletions src/dev/build/tasks/os_packages/run_fpm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Environment=KBN_PATH_CONF=/etc/kibana
EnvironmentFile=-/etc/default/kibana
EnvironmentFile=-/etc/sysconfig/kibana

ExecStart=/usr/share/kibana/bin/kibana --logging.dest="/var/log/kibana/kibana.log" --pid.file="/run/kibana/kibana.pid"
ExecStart=/usr/share/kibana/bin/kibana

Restart=on-failure
RestartSec=3
Expand Down