kibana7: drop (022ee4d7) · Commits · nix / nixpkgs

nixos/modules/module-list.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -1147,7 +1147,6 @@
		./services/search/elasticsearch-curator.nix
		./services/search/elasticsearch.nix
		./services/search/hound.nix
		./services/search/kibana.nix
		./services/search/meilisearch.nix
		./services/search/opensearch.nix
		./services/search/qdrant.nix

nixos/modules/services/search/kibana.nix

deleted100644 → 0

+0 −213

Original line number	Diff line number	Diff line
		{ config, lib, options, pkgs, ... }:

		with lib;

		let
		cfg = config.services.kibana;
		opt = options.services.kibana;

		ge7 = builtins.compareVersions cfg.package.version "7" >= 0;
		lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0;

		cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
		(filterAttrsRecursive (n: v: v != null && v != []) ({
		server.host = cfg.listenAddress;
		server.port = cfg.port;
		server.ssl.certificate = cfg.cert;
		server.ssl.key = cfg.key;

		kibana.index = cfg.index;
		kibana.defaultAppId = cfg.defaultAppId;

		elasticsearch.url = cfg.elasticsearch.url;
		elasticsearch.hosts = cfg.elasticsearch.hosts;
		elasticsearch.username = cfg.elasticsearch.username;
		elasticsearch.password = cfg.elasticsearch.password;

		elasticsearch.ssl.certificate = cfg.elasticsearch.cert;
		elasticsearch.ssl.key = cfg.elasticsearch.key;
		elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities;
		} // cfg.extraConf)
		)));

		in {
		options.services.kibana = {
		enable = mkEnableOption (lib.mdDoc "kibana service");

		listenAddress = mkOption {
		description = lib.mdDoc "Kibana listening host";
		default = "127.0.0.1";
		type = types.str;
		};

		port = mkOption {
		description = lib.mdDoc "Kibana listening port";
		default = 5601;
		type = types.port;
		};

		cert = mkOption {
		description = lib.mdDoc "Kibana ssl certificate.";
		default = null;
		type = types.nullOr types.path;
		};

		key = mkOption {
		description = lib.mdDoc "Kibana ssl key.";
		default = null;
		type = types.nullOr types.path;
		};

		index = mkOption {
		description = lib.mdDoc "Elasticsearch index to use for saving kibana config.";
		default = ".kibana";
		type = types.str;
		};

		defaultAppId = mkOption {
		description = lib.mdDoc "Elasticsearch default application id.";
		default = "discover";
		type = types.str;
		};

		elasticsearch = {
		url = mkOption {
		description = lib.mdDoc ''
		Elasticsearch url.

		Defaults to `"http://localhost:9200"`.

		Don't set this when using Kibana >= 7.0.0 because it will result in a
		configuration error. Use {option}`services.kibana.elasticsearch.hosts`
		instead.
		'';
		default = null;
		type = types.nullOr types.str;
		};

		hosts = mkOption {
		description = lib.mdDoc ''
		The URLs of the Elasticsearch instances to use for all your queries.
		All nodes listed here must be on the same cluster.

		Defaults to `[ "http://localhost:9200" ]`.

		This option is only valid when using kibana >= 6.6.
		'';
		default = null;
		type = types.nullOr (types.listOf types.str);
		};

		username = mkOption {
		description = lib.mdDoc "Username for elasticsearch basic auth.";
		default = null;
		type = types.nullOr types.str;
		};

		password = mkOption {
		description = lib.mdDoc "Password for elasticsearch basic auth.";
		default = null;
		type = types.nullOr types.str;
		};

		ca = mkOption {
		description = lib.mdDoc ''
		CA file to auth against elasticsearch.

		It's recommended to use the {option}`certificateAuthorities` option
		when using kibana-5.4 or newer.
		'';
		default = null;
		type = types.nullOr types.path;
		};

		certificateAuthorities = mkOption {
		description = lib.mdDoc ''
		CA files to auth against elasticsearch.

		Please use the {option}`ca` option when using kibana \< 5.4
		because those old versions don't support setting multiple CA's.

		This defaults to the singleton list [ca] when the {option}`ca` option is defined.
		'';
		default = lib.optional (cfg.elasticsearch.ca != null) ca;
		defaultText = literalExpression ''
		lib.optional (config.${opt.elasticsearch.ca} != null) ca
		'';
		type = types.listOf types.path;
		};

		cert = mkOption {
		description = lib.mdDoc "Certificate file to auth against elasticsearch.";
		default = null;
		type = types.nullOr types.path;
		};

		key = mkOption {
		description = lib.mdDoc "Key file to auth against elasticsearch.";
		default = null;
		type = types.nullOr types.path;
		};
		};

		package = mkOption {
		description = lib.mdDoc "Kibana package to use";
		default = pkgs.kibana;
		defaultText = literalExpression "pkgs.kibana";
		type = types.package;
		};

		dataDir = mkOption {
		description = lib.mdDoc "Kibana data directory";
		default = "/var/lib/kibana";
		type = types.path;
		};

		extraConf = mkOption {
		description = lib.mdDoc "Kibana extra configuration";
		default = {};
		type = types.attrs;
		};
		};

		config = mkIf (cfg.enable) {
		assertions = [
		{
		assertion = ge7 -> cfg.elasticsearch.url == null;
		message =
		"The option services.kibana.elasticsearch.url has been removed when using kibana >= 7.0.0. " +
		"Please use option services.kibana.elasticsearch.hosts instead.";
		}
		{
		assertion = lt6_6 -> cfg.elasticsearch.hosts == null;
		message =
		"The option services.kibana.elasticsearch.hosts is only valid for kibana >= 6.6.";
		}
		];
		systemd.services.kibana = {
		description = "Kibana Service";
		wantedBy = [ "multi-user.target" ];
		after = [ "network.target" "elasticsearch.service" ];
		environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
		serviceConfig = {
		ExecStart =
		"${cfg.package}/bin/kibana" +
		" --config ${cfgFile}" +
		" --path.data ${cfg.dataDir}";
		User = "kibana";
		WorkingDirectory = cfg.dataDir;
		};
		};

		environment.systemPackages = [ cfg.package ];

		users.users.kibana = {
		isSystemUser = true;
		description = "Kibana service user";
		home = cfg.dataDir;
		createHome = true;
		group = "kibana";
		};
		users.groups.kibana = {};
		};
		}

nixos/tests/elk.nix

+0 −14

Original line number	Diff line number	Diff line
		@@ -119,11 +119,6 @@ let
		package = elk.elasticsearch;
		};

		kibana = {
		enable = true;
		package = elk.kibana;
		};

		elasticsearch-curator = {
		enable = true;
		actionYAML = ''
		@@ -217,13 +212,6 @@ let
		one.wait_until_succeeds("cat /tmp/logstash.out \| grep flowers")
		one.wait_until_succeeds("cat /tmp/logstash.out \| grep -v dragons")

		with subtest("Kibana is healthy"):
		one.wait_for_unit("kibana.service")
		one.wait_until_succeeds(
		"curl --silent --show-error --fail-with-body 'http://localhost:5601/api/status'"
		+ " \| jq -es 'if . == [] then null else .[] \| .status.overall.state == \"green\" end'"
		)

		with subtest("Metricbeat is running"):
		one.wait_for_unit("metricbeat.service")

		@@ -274,7 +262,6 @@ in {
		# name = "elk-7";
		# elasticsearch = pkgs.elasticsearch7-oss;
		# logstash = pkgs.logstash7-oss;
		# kibana = pkgs.kibana7-oss;
		# filebeat = pkgs.filebeat7;
		# metricbeat = pkgs.metricbeat7;
		# };
		@@ -282,7 +269,6 @@ in {
		ELK-7 = mkElkTest "elk-7" {
		elasticsearch = pkgs.elasticsearch7;
		logstash = pkgs.logstash7;
		kibana = pkgs.kibana7;
		filebeat = pkgs.filebeat7;
		metricbeat = pkgs.metricbeat7;
		};

pkgs/development/tools/misc/kibana/7.x.nix

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		{ elk7Version
		, enableUnfree ? true
		, lib
		, stdenv
		, makeWrapper
		, fetchurl
		, nodejs_16
		, coreutils
		, which
		}:

		let
		nodejs = nodejs_16;
		inherit (builtins) elemAt;
		info = lib.splitString "-" stdenv.hostPlatform.system;
		arch = elemAt info 0;
		plat = elemAt info 1;
		hashes =
		{
		x86_64-linux = "sha512-09XokG5krjxGnk34DhxpLOGRLjb2jd82uZtwGfrzSuuqMpBhkEptK2oySGxuGdHF8uowwlR5p5YO2TvBwMsWkQ==";
		x86_64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg==";
		aarch64-linux = "sha512-zhtYThz5j4+w5gI1JWSnHv709Tk23eegVsrtYmdaYhZiTw2yvCTYI5uNAfBjBr8XPdp6CKF4e6Bh2wHKDYg1mg==";
		aarch64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg==";
		};

		in stdenv.mkDerivation rec {
		pname = "kibana";
		version = elk7Version;

		src = fetchurl {
		url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz";
		hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
		};

		patches = [
		# Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3.
		# The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
		# disable the version check.
		./disable-nodejs-version-check-7.patch
		];

		nativeBuildInputs = [ makeWrapper ];

		installPhase = ''
		mkdir -p $out/libexec/kibana $out/bin
		mv * $out/libexec/kibana/
		rm -r $out/libexec/kibana/node
		makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
		--prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
		sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
		'';

		meta = with lib; {
		description = "Visualize logs and time-stamped data";
		homepage = "http://www.elasticsearch.org/overview/kibana";
		license = licenses.elastic20;
		maintainers = with maintainers; [ offline basvandijk ];
		platforms = with platforms; unix;
		};
		}

pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
		index 3f611e5a..f5c60c85 100644
		--- a/src/setup_node_env/node_version_validator.js
		+++ b/src/setup_node_env/node_version_validator.js
		@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c
		var currentVersion = process && process.version \|\| null;
		var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node \|\| null;
		var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
		-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
		+var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.

		if (!isVersionValid) {
		var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.

		console.error(errorMessage);
		process.exit(1);
		-}
		\ No newline at end of file
		+}