grafana/docs
Ernie Hershey 5cfc681175 Docs: Clean up influxdb.md (#20618)
* Clean up influxdb.md

Mostly typos, some wording consistency and clarification

* feature-rich

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* Query editor wording

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* Update docs/sources/features/datasources/influxdb.md

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* One less "you can"

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* Query example wording

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* Remove extraneous newline

* Use less words

Co-Authored-By: Marcus Olsson <olsson.e.marcus@gmail.com>

* Remove more newlines

* Use present tense

* Add missing 'to'

* Summary fixup

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Down with gerunds in headers

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* consistent tenses

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Remove br html tag #1

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Remove br html tag #2

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Less future tense

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Spell out location of annotations view

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Query input fixups

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* More detail on where to access InfluxDB editor

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Provisioning fixups

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2019-11-27 08:45:08 -08:00
..
sources Docs: Clean up influxdb.md (#20618) 2019-11-27 08:45:08 -08:00
config.toml docs: minor fix 2017-03-17 19:33:31 +01:00
Dockerfile docs: added versions file 2018-01-30 13:28:16 +01:00
logo-horizontal.png Docs: Simplify README (#19702) 2019-10-08 17:22:37 +02:00
logo-swirl.svg Docs: Simplify README (#19702) 2019-10-08 17:22:37 +02:00
Makefile Chore: Hugo upgrade (#17494) 2019-06-12 08:01:44 +02:00
publish.sh docs: add publish bash script 2017-05-02 10:20:09 +02:00
README.md Docs: Update keyboard shortcuts formatting (#19637) 2019-10-07 14:56:00 +02:00
s3_website.json Added grafana 1.x docs to main repo 2015-03-10 08:56:03 +01:00
versions.json docs: update versions (#20635) 2019-11-25 15:40:27 +01:00
yarn.lock test: added first react snapshot test 2017-10-22 12:48:20 +02:00

Note for external contributors

We are currently working on migrating the docs to a new static website. The grafana/website repository will be private during this migration, which unfortunately means the docs site can't be built without access.

The Markdown content however, is still public in this repository. We still encourage pull requests to make the docs better, and we will make sure the changed content works well on the current docs site. Include any images in your pull request, and we will move them to the grafana/website repository.

Building the docs

To build the docs locally, you need to have Docker installed. The docs are built using Hugo - a static site generator.

Prepare the Docker image:

Due to migration to new static site, the Docker image needs to be built from old-docs branch.

Git clone grafana/website repo. Run these commands in the root of that repo. Note that you may require sudo when running make docs-build depending on how your system's Docker service is configured):

git clone https://github.com/grafana/website
cd website
make docs-build

Build the Documentation:

Now that the Docker image has been prepared we can build the grafana docs and start a docs server.

If you have not cloned the Grafana repository already then:

cd ..
git clone https://github.com/grafana/grafana

Switch your working directory to the directory this file (README.md) is in.

cd grafana/docs

An AWS config file is required to build the docs Docker image and to publish the site to AWS. If you are building locally only and do not have any AWS credentials for docs.grafana.org then create an empty file named awsconfig in the current directory.

touch awsconfig

Then run (possibly with sudo):

make watch

This command will not return control of the shell to the user. Instead the command is now running a new Docker container built from the image we created in the previous step.

Open localhost:3004 to view the docs.

Images and Content

All markdown files are part of this repository. However, all images are added to the website repository. Therefore, the process of adding images is not as straightforward. These are the steps:

  1. Ensure you create a feature branch within the website repository to make the change. This branch needs to be based on the old-docs branch.
  2. Ensure the image(s) are compressed and optimised e.g. Using tinypng.
  3. Add the image(s) to the /static/img/docs directory.
  4. Then, make a commit that adds the image(s).
  5. The Pull Request you create needs to target where you branched off, the branch old-docs.

Finally, run:

make docs-build

This will rebuild the docs Docker image.

To be able to use your image(s) you have to quit (Ctrl+C) the make watch command (that you run in the same directory as this README). Then simply rerun make watch, it will restart the docs server but now with access to your image(s).

Editing content

Changes to the markdown files should automatically cause a docs rebuild and live reload should reload the page in your browser.

Troubleshooting

Running make watch errors out with Warning: Task "default" not found.

Ensure that the Docker image from the website repository is built using the old-docs branch.