Merge branch 'master' into swift_prometheus

Author: MrLotU

.gitattributes

@@ -0,0 +1,2 @@
+static/bootstrap-3.4.1/* linguist-vendored
+static/font-awesome-4.7.0/* linguist-vendored

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Prometheus Community Support
+    url: https://prometheus.io/community/
+    about: If you need help or support, please request help here.
+  - name: Commercial Support & Training
+    url: https://prometheus.io/support-training/
+    about: If you want commercial support or training, vendors are listed here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+<!--
+    Please sign CNCF's Developer Certificate of Origin and sign-off your commits by adding the -s / --sign-off flag to `git commit`
+
+    More information on both of those can be found at https://github.com/apps/dco
+
+    If you are proposing a new integration, exporter, or client library, please include representative sample output.
+ -->

.gitignore

@@ -5,8 +5,7 @@ output/
 
 # Temporary file directory
 tmp/
-/downloads/
-/repositories/
+downloads/
 
 # Crash Log
 crash.log

.ruby-version

@@ -1 +1 @@
-2.4.3
+2.7.1

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+## Prometheus Community Code of Conduct
+
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

Dockerfile

@@ -1,5 +1,11 @@
-FROM   ruby:2.1-onbuild
-EXPOSE 3000
-RUN    bundle exec nanoc
-CMD    bundle exec nanoc view
-VOLUME output
+FROM    ruby:2.7
+EXPOSE  3000
+WORKDIR /usr/src/app
+COPY    Gemfile /usr/src/app/
+COPY    Gemfile.lock /usr/src/app/
+RUN     gem update bundler
+RUN     bundle install
+COPY    . /usr/src/app
+RUN     bundle exec nanoc --verbose
+CMD     bundle exec nanoc view --host 0.0.0.0
+VOLUME  output

Gemfile

@@ -9,6 +9,7 @@ gem 'nokogiri'
 gem 'redcarpet'
 gem 'pygments.rb'
 gem 'builder'
+gem 'semverse'
 gem 'rb-inotify', :require => false
 gem 'rb-fsevent', :require => false
 gem 'rb-fchange', :require => false

Gemfile.lock

@@ -1,29 +1,28 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    adsf (1.4.1)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    adsf (1.4.5)
       rack (>= 1.0.0, < 3.0.0)
-    builder (3.2.2)
-    coderay (1.1.2)
+    builder (3.2.4)
+    coderay (1.1.3)
     colored (1.2)
-    concurrent-ruby (1.0.5)
-    cri (2.10.1)
-      colored (~> 1.2)
+    concurrent-ruby (1.1.8)
+    cri (2.15.11)
     ddmemoize (1.0.0)
       ddmetrics (~> 1.0)
       ref (~> 2.0)
     ddmetrics (1.0.1)
-    ddplugin (1.0.2)
-    diff-lcs (1.2.5)
-    em-websocket (0.5.1)
+    ddplugin (1.0.3)
+    diff-lcs (1.4.4)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.15.0)
     formatador (0.2.5)
-    guard (2.14.2)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -38,72 +37,106 @@ GEM
       guard (~> 2.8)
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    guard-nanoc (2.1.2)
+    guard-nanoc (2.1.9)
       guard (~> 2.8)
       guard-compat (~> 1.0)
-      nanoc (>= 4.3.8, < 5.0)
+      nanoc-cli (~> 4.11, >= 4.11.14)
+      nanoc-core (~> 4.11, >= 4.11.14)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    kramdown (1.17.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
-    nanoc (4.9.3)
+    json_schema (0.21.0)
+    kramdown (2.3.1)
+      rexml
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mini_portile2 (2.5.1)
+    multi_json (1.15.0)
+    nanoc (4.12.0)
       addressable (~> 2.5)
-      cri (~> 2.8)
+      colored (~> 1.2)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (= 4.12.0)
+      nanoc-core (= 4.12.0)
+      nanoc-deploying (~> 1.0)
+      parallel (~> 1.12)
+      tty-command (~> 0.8)
+      tty-which (~> 0.4)
+    nanoc-checking (1.0.1)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
+    nanoc-cli (4.12.0)
+      cri (~> 2.15)
+      diff-lcs (~> 1.3)
+      nanoc-core (= 4.12.0)
+      zeitwerk (~> 2.1)
+    nanoc-core (4.12.0)
+      concurrent-ruby (~> 1.1)
       ddmemoize (~> 1.0)
       ddmetrics (~> 1.0)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
-      parallel (~> 1.12)
-      ref (~> 2.0)
+      json_schema (~> 0.19)
       slow_enumerator_tools (~> 1.0)
       tomlrb (~> 1.2)
+      tty-platform (~> 0.2)
+      zeitwerk (~> 2.1)
+    nanoc-deploying (1.0.1)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
     nenv (0.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
+    nokogiri (1.11.4)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    pygments.rb (1.2.1)
-      multi_json (>= 1.0.0)
-    rack (2.0.5)
+    parallel (1.20.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    pygments.rb (2.1.0)
+    racc (1.5.2)
+    rack (2.2.3)
     rb-fchange (0.0.6)
       ffi
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.2.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    redcarpet (3.5.1)
     ref (2.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    semverse (3.0.0)
     shellany (0.0.1)
     slow_enumerator_tools (1.1.0)
-    thor (0.20.0)
-    tomlrb (1.2.7)
+    thor (1.1.0)
+    tomlrb (1.3.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-platform (0.3.0)
+    tty-which (0.4.2)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -122,6 +155,7 @@ DEPENDENCIES
   rb-inotify
   redcarpet
   rspec
+  semverse
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

MAINTAINERS.md

@@ -1 +1,17 @@
-* Brian Brazil <[email protected]>
+Documentation that refers to a specific project within the Prometheus ecosystem
+is maintained by the maintainers of the respective project. For example, refer
+to the maintainers specified in Alertmanager's
+[MAINTAINERS.md](https://github.com/prometheus/alertmanager/blob/master/MAINTAINERS.md)
+file for documentation about the Alertmanager.
+
+Note that the documentation for the Prometheus server is located in the
+[prometheus/prometheus
+repository](https://github.com/prometheus/prometheus/tree/master/docs) itself.
+
+For anything that is not documentation for a specific project, refer to the
+following maintainers with their focus areas:
+
+* Julius Volz <[email protected]> @juliusv: Web design, static site
+  generator.
+* Richard Hartmann <[email protected]> @RichiH: Everything
+  else.