From 2165805578539146c099b9900d386fde189dbc29 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jbudz@users.noreply.github.com>
Date: Tue, 28 Jun 2016 10:21:31 -0500
Subject: [PATCH] Backport data path from PR #7562

---
 .gitignore                              | 1 +
 {installedPlugins/.data => data}/.empty | 0
 installedPlugins/.empty                 | 0
 src/server/path/index.js                | 2 +-
 tasks/build/data.js                     | 5 +++++
 tasks/build/index.js                    | 1 +
 tasks/build/installedPlugins.js         | 1 -
 tasks/build/osPackages.js               | 4 ++--
 8 files changed, 10 insertions(+), 4 deletions(-)
 rename {installedPlugins/.data => data}/.empty (100%)
 create mode 100644 installedPlugins/.empty
 create mode 100644 tasks/build/data.js

diff --git a/.gitignore b/.gitignore
index 80ed93f76b6283..1aefc703173a3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ target
 .htpasswd
 .eslintcache
 installedPlugins
+data
 disabledPlugins
 webpackstats.json
 config/kibana.dev.yml
diff --git a/installedPlugins/.data/.empty b/data/.empty
similarity index 100%
rename from installedPlugins/.data/.empty
rename to data/.empty
diff --git a/installedPlugins/.empty b/installedPlugins/.empty
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/src/server/path/index.js b/src/server/path/index.js
index 15ca518055632b..7c6682610fccb1 100644
--- a/src/server/path/index.js
+++ b/src/server/path/index.js
@@ -9,7 +9,7 @@ const CONFIG_PATHS = [
 
 const DATA_PATHS = [
   process.env.DATA_PATH,
-  fromRoot('installedPlugins/.data'),
+  fromRoot('data'),
   '/var/lib/kibana'
 ].filter(Boolean);
 
diff --git a/tasks/build/data.js b/tasks/build/data.js
new file mode 100644
index 00000000000000..b2a4d1a6fb3c01
--- /dev/null
+++ b/tasks/build/data.js
@@ -0,0 +1,5 @@
+export default function (grunt) {
+  grunt.registerTask('_build:data', function () {
+    grunt.file.mkdir('build/kibana/data');
+  });
+};
diff --git a/tasks/build/index.js b/tasks/build/index.js
index 000ea9095d3f07..1930f60c690122 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -11,6 +11,7 @@ module.exports = function (grunt) {
       'babel:build',
       '_build:babelOptions',
       '_build:installedPlugins',
+      '_build:data',
       '_build:packageJson',
       '_build:readme',
       '_build:babelCache',
diff --git a/tasks/build/installedPlugins.js b/tasks/build/installedPlugins.js
index 5d2fcc4d4ed373..7d8d6618ff4880 100644
--- a/tasks/build/installedPlugins.js
+++ b/tasks/build/installedPlugins.js
@@ -1,6 +1,5 @@
 module.exports = function (grunt) {
   grunt.registerTask('_build:installedPlugins', function () {
     grunt.file.mkdir('build/kibana/installedPlugins');
-    grunt.file.mkdir('build/kibana/installedPlugins/.data');
   });
 };
diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
index 30b99a9a1623d1..fa79a8331ed3d0 100644
--- a/tasks/build/osPackages.js
+++ b/tasks/build/osPackages.js
@@ -45,7 +45,7 @@ export default (grunt) => {
         '--template-value', `pluginsDir=${config.path.plugins}`,
         '--template-value', `dataDir=${config.path.data}`,
         //uses relative path to --prefix, strip the leading /
-        '--exclude', `${config.path.home.slice(1)}/installedPlugins/.data`
+        '--exclude', `${config.path.home.slice(1)}/data`
       ];
       const debOptions = [
         '-t', 'deb',
@@ -57,7 +57,7 @@ export default (grunt) => {
       ];
       const args = [
         `${buildDir}/=${config.path.home}/`,
-        `${buildDir}/installedPlugins/.data/=${config.path.data}/`,
+        `${buildDir}/data/=${config.path.data}/`,
         `${servicesByName.sysv.outputDir}/etc/=/etc/`,
         `${servicesByName.systemd.outputDir}/etc/=/etc/`
       ];