Torkel Ödegaard 10 vuotta sitten
vanhempi
commit
5f5bb8541b
3 muutettua tiedostoa jossa 11 lisäystä ja 1 poistoa
  1. 7 0
      .gitignore
  2. 3 0
      docs/Makefile
  3. 1 1
      docs/sources/index.md

+ 7 - 0
.gitignore

@@ -5,6 +5,13 @@ awsconfig
 /dist
 /tmp
 
+docs/AWS_S3_BUCKET
+docs/GIT_BRANCH
+docs/VERSION
+docs/GITCOMMIT
+docs/changed-files
+docs/changed-files
+
 # locally required config files
 web.config
 config.js

+ 3 - 0
docs/Makefile

@@ -44,4 +44,7 @@ docs-test: docs-build
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 
 docs-build:
+  git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > /changed-files
+	echo "$(GIT_BRANCH)" > docs/GIT_BRANCH
+	echo "$(GITCOMMIT)" > docs/GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .

+ 1 - 1
docs/sources/index.md

@@ -9,7 +9,7 @@ rich ways to visualize time series metrics, mainly though graphs but supports ot
 a pluggable panel architecture. It currently 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.
 
-It is most common usage is for infrastructure monitoring, application monitoring and metric analytics. But Grafana
+It is most commonly used for infrastructure monitoring, application monitoring and metric analytics. But Grafana
 has an open architecture and design that enabled is to be used in other domains as well, like home automation,
 weather and industrial sensors analytics.