Updated docs

This commit is contained in:
Torkel Ödegaard 2015-03-09 20:20:44 +01:00
parent 5ab64987eb
commit d7ce7271fe
4 changed files with 12 additions and 13 deletions

View File

@ -15,9 +15,9 @@ COPY ./VERSION VERSION
#COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md #COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md
# TODO: don't do this - look at merging the yml file in build.sh # TODO: don't do this - look at merging the yml file in build.sh
COPY ./mkdocs.yml mkdocs.yml COPY ./mkdocs.yml /docs/mkdocs.yml
COPY ./s3_website.json s3_website.json COPY ./s3_website.json /docs/s3_website.json
# Then build everything together, ready for mkdocs # Then build everything together, ready for mkdocs
RUN /docs/build.sh RUN /docs/build.sh

View File

@ -36,7 +36,9 @@ docs-shell: docs-build
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
docs-release: docs-build docs-release: docs-build
$(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT -e DISTRIBUTION_ID "$(DOCKER_DOCS_IMAGE)" ./release.sh $(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT -e DISTRIBUTION_ID \
-v $(CURDIR)/awsconfig:/docs/awsconfig \
"$(DOCKER_DOCS_IMAGE)" ./release.sh
docs-test: docs-build docs-test: docs-build
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh $(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh

View File

@ -6,8 +6,6 @@
"Suffix": "index.html" "Suffix": "index.html"
}, },
"RoutingRules": [ "RoutingRules": [
{ "Condition": { "KeyPrefixEquals": "en/latest/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
{ "Condition": { "KeyPrefixEquals": "en/master/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
{ "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } } { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } }
] ]
} }

View File

@ -4,15 +4,14 @@ page_keywords: grafana, introduction, documentation, about
# About # About
Grafana is a frontend for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org) Grafana is a general purpose dashboard and graph composer. Its focused on providing
and [OpenTSDB](http://opentsdb.net) with powerfull visualization features for time series data. rich ways to visualize time series metrics, mainly though graphs. It currently
You will need either a Graphite, InfluxDB or OpenTSDB server for Grafana to be of any use. has rich support for for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org)
and [OpenTSDB](http://opentsdb.net). But supports other data sources via plugins.
## Why Grafana?
because its the best.
## Release notes
## License ## License
Grafana is licensed under Apache 2.0. See [LICENSE](https://github.com/grafana/grafana/blob/master/LICENSE.mdhttps://github.com/grafana/grafana/blob/master/LICENSE.md)
for full license text.