github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[x-pack/readme] remove left-over merge conflict

Browse source 
(cherry picked from commit 7e41dc5248)
This commit is contained in:
spalger 2018-05-02 13:54:50 -07:00
parent 5d37bf5619
commit 53a0a93769
1 changed files with 0 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

52
x-pack/README.md
View file

@ -125,55 +125,3 @@ That's thanks to the binary Phantom downloads that have to happen, and Bitbucket
1. Just keep re-running the command until it passes. Eventually the downloads will work, and since they are cached, it won't ever be an issue again.
1. Download them by hand [from Bitbucket](https://bitbucket.org/ariya/phantomjs/downloads) and copy them into the `.phantom` path. We're currently using 1.9.8, and you'll need the Window, Mac, and Linux builds.
<<<<<<< HEAD
## Building and Packaging
Make sure you have the dependencies installed by running `yarn kbn bootstrap`.
Once complete, use `yarn build`. Output will be placed in the `build` path (it will be created).
To drop the `SNAPSHOT` off the version, use the release flag, `-r` or `--release`
If you'd like to get a zip package and a sha1 checksum file, use `yarn package`. Output will be placed in the `target` path (it will be created). Resulting build output will also be left in the `build` path.
## Releasing
Make sure you have the dependencies installed by running `yarn kbn bootstrap`.
Once complete, use `yarn release`. Build and package output will be placed in the `build` and `target` paths respectively (they will be created).
Note that you will need AWS credentials for the upload to succeed. To provide these credentials, create a `~/.aws/credentials` file with your credentials, which should look like this:
```
[default] ; the default profile
aws_access_key_id = ...
aws_secret_access_key = ...
[another-config] ; my "personal-account" profile
aws_access_key_id = ...
aws_secret_access_key = ...
```
The `default` profile is used automatically, but setting the `AWS_PROFILE` environment variable will allow you to use another profile, if you happen to have multiple.
`AWS_PROFILE=another-config yarn release`
See [the AWS docs](http://docs.aws.amazon.com/AWSJavaScriptSDK/guide/node-configuring.html#Creating_the_Shared_Credentials_File) for more information.
# Building documentation
This repo contains X-Pack information that is used in the Kibana User Guide in 5.5 and later.
To build the Kibana User Guide on your local machine, ensure you have the following folders:
```
$ ls $PATH_TO_REPOS
├── kibana
└── kibana-extra/x-pack-kibana
```
To build the Kibana User Guide, use the docbldkb or docbldkbx build commands defined in https://github.com/elastic/docs/blob/master/doc_build_aliases.sh
=======
>>>>>>> Updates to contributing guide and defaults (#13)