Fixed build system after rename exporter dir to agent and other minor issues.

This commit is contained in:
Boaz Leskes 2014-01-22 16:54:27 +01:00
parent 8072c2180b
commit c8df3d4946
4 changed files with 13 additions and 13 deletions

View file

@ -6,7 +6,7 @@ module.exports = function (grunt) {
pkg: grunt.file.readJSON('package.json'),
kibanaCheckoutDir: './kibana/vendor/kibana',
kibanaRevision: 'master',
exporterDir: 'exporter',
agentDir: 'agent',
buildDir: 'build',
packageDir: 'build/packages',
senseDir: './sense',

View file

@ -2,23 +2,23 @@
"links": [
{
"name": "Cluster Overview",
"url": "/kibana/index.html#/dashboard/file/marvel.overview.json"
"url": "../kibana/index.html#/dashboard/file/marvel.overview.json"
},
{
"name": "Cluster Pulse",
"url": "/kibana/index.html#/dashboard/file/marvel.cluster_pulse.json"
"url": "../kibana/index.html#/dashboard/file/marvel.cluster_pulse.json"
},
{
"name": "Sense",
"url": "/sense/index.html"
"url": "../sense/index.html"
},
{
"name": "Node Statistics",
"url": "/kibana/index.html#/dashboard/script/marvel.nodes_stats.js"
"url": "../kibana/index.html#/dashboard/script/marvel.nodes_stats.js"
},
{
"name": "Index Statistics",
"url": "/kibana/index.html#/dashboard/script/marvel.indices_stats.js"
"url": "../kibana/index.html#/dashboard/script/marvel.indices_stats.js"
}
]
}

View file

@ -4,7 +4,7 @@ module.exports = function (config) {
files: [
{
// agent jar
cwd: '<%= exporterDir %>/target',
cwd: '<%= agentDir %>/target',
expand: true,
src: ['<%= pkg.name %>-<%= pkg.version %>.jar'],
dest: '<%= buildDir %>'
@ -19,7 +19,7 @@ module.exports = function (config) {
{
cwd: '.',
expand: true,
src: ['index.html', 'common'],
src: ['index.html', './common/**'],
dest: '<%= buildSiteDir %>'
}
]},
@ -33,13 +33,13 @@ module.exports = function (config) {
},
{
expand: true,
cwd: 'dashboards',
cwd: 'kibana/dashboards',
src: '**',
dest: '<%= buildTempDir %>/src/app/dashboards/marvel'
},
{
expand: true,
cwd: 'panels',
cwd: 'kibana/panels',
src: '**',
dest: '<%= buildTempDir %>/src/app/panels/marvel'
}

View file

@ -2,12 +2,12 @@ module.exports = function (config) {
return {
maven_clean: {
command: 'mvn clean',
cwd: '<%= exporterDir %>',
cwd: '<%= agentDir %>',
options: {
stdout: true,
failOnError: true,
execOptions: {
cwd: '<%= exporterDir %>',
cwd: '<%= agentDir %>',
}
},
},
@ -17,7 +17,7 @@ module.exports = function (config) {
stdout: true,
failOnError: true,
execOptions: {
cwd: '<%= exporterDir %>',
cwd: '<%= agentDir %>',
}
},
},