Bladeren bron

Merge pull request #223 from sensu/feature/doc-cleanups

Feature: Cleanup ReadTheDocs
Jared 6 jaren geleden
bovenliggende
commit
9e661a0fe2
10 gewijzigde bestanden met toevoegingen van 110 en 56 verwijderingen
  1. 2 0
      Pipfile
  2. 64 7
      Pipfile.lock
  3. 1 1
      docs/custom_client_config.md
  4. 2 2
      docs/deploy_plugins.md
  5. 1 1
      docs/dynamic_checks.md
  6. 32 37
      docs/index.md
  7. 1 1
      docs/integration.md
  8. 1 1
      docs/role_variables.md
  9. 5 5
      docs/testing.md
  10. 1 1
      mkdocs.yml

+ 2 - 0
Pipfile

@@ -8,6 +8,8 @@ name = "pypi"
 [dev-packages]
 docker-py = "*"
 molecule = "==2.20.1"
+mkdocs = "*"
+tornado = "*"
 
 [requires]
 python_version = "2.7"

+ 64 - 7
Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3ad2bec30b34f5f1dc80731aaa12fc72886915f327544353e75d33f6d0a7933a"
+            "sha256": "98c48c1c190f40473dc797f9d8303b1733832e17a71456358d8b9a4bfc31f14f"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -188,9 +188,17 @@
                 "sha256:8be81d89d6e7b4c0d4e44bcc525845f6da25821de80cb5e06e7e0238a2899e32",
                 "sha256:da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"
             ],
-            "markers": "python_version == '2.7'",
+            "markers": "python_version < '3'",
             "version": "==3.7.4"
         },
+        "contextlib2": {
+            "hashes": [
+                "sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48",
+                "sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"
+            ],
+            "markers": "python_version < '3'",
+            "version": "==0.5.5"
+        },
         "cookiecutter": {
             "hashes": [
                 "sha256:1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e",
@@ -251,7 +259,7 @@
                 "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
                 "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
             ],
-            "markers": "python_version < '3.4'",
+            "markers": "python_version < '3'",
             "version": "==1.1.6"
         },
         "fasteners": {
@@ -305,6 +313,13 @@
             ],
             "version": "==2.7"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:46fc60c34b6ed7547e2a723fc8de6dc2e3a1173f8423246b3ce497f064e9c3de",
+                "sha256:bc136180e961875af88b1ab85b4009f4f1278f8396a60526c0009f503a1a96ca"
+            ],
+            "version": "==0.9"
+        },
         "ipaddress": {
             "hashes": [
                 "sha256:64b28eec5e78e7510698f6d4da08800a5c575caa4a286c93d651c5d3ff7b6794",
@@ -327,6 +342,20 @@
             ],
             "version": "==0.2.0"
         },
+        "livereload": {
+            "hashes": [
+                "sha256:29cadfabcedd12eed792e0131991235b9d4764d4474bed75cf525f57109ec0a2",
+                "sha256:e632a6cd1d349155c1d7f13a65be873b38f43ef02961804a1bba8d817fa649a7"
+            ],
+            "version": "==2.6.0"
+        },
+        "markdown": {
+            "hashes": [
+                "sha256:fc4a6f69a656b8d858d7503bda633f4dd63c2d70cf80abdc6eafa64c4ae8c250",
+                "sha256:fe463ff51e679377e3624984c829022e2cfb3be5518726b06f608a07a3aad680"
+            ],
+            "version": "==3.1"
+        },
         "markupsafe": {
             "hashes": [
                 "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473",
@@ -367,6 +396,14 @@
             ],
             "version": "==0.6.1"
         },
+        "mkdocs": {
+            "hashes": [
+                "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939",
+                "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"
+            ],
+            "index": "pypi",
+            "version": "==1.0.4"
+        },
         "molecule": {
             "hashes": [
                 "sha256:0e9ef6845cdf2a01f6c386445e4e54add3f515a033ee16b7b658e6122c8f0d76",
@@ -403,7 +440,7 @@
                 "sha256:25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742",
                 "sha256:5887121d7f7df3603bca2f710e7219f3eca0eb69e0b7cc6e0a022e155ac931a7"
             ],
-            "markers": "python_version < '3.6'",
+            "markers": "python_version < '3'",
             "version": "==2.3.3"
         },
         "pathspec": {
@@ -428,10 +465,10 @@
         },
         "pluggy": {
             "hashes": [
-                "sha256:19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f",
-                "sha256:84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746"
+                "sha256:1c0b297d4d41bc9bdfbdc17991b35f9e1d2cfe8eaa4d7c118e86d705870d34c8",
+                "sha256:fb2f776b7ec85038ef95860f4e83bfb6ab171a9d0b70b69d7ca4d04130644c2b"
             ],
-            "version": "==0.9.0"
+            "version": "==0.10.0"
         },
         "poyo": {
             "hashes": [
@@ -649,6 +686,19 @@
             ],
             "version": "==1.19.0"
         },
+        "tornado": {
+            "hashes": [
+                "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d",
+                "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409",
+                "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f",
+                "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f",
+                "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5",
+                "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb",
+                "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"
+            ],
+            "index": "pypi",
+            "version": "==5.1.1"
+        },
         "tree-format": {
             "hashes": [
                 "sha256:a538523aa78ae7a4b10003b04f3e1b37708e0e089d99c9d3b9e1c71384c9a7f9",
@@ -692,6 +742,13 @@
                 "sha256:8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7"
             ],
             "version": "==1.15.0"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:139391b239594fd8b91d856bc530fbd2df0892b17dd8d98a91f018715954185f",
+                "sha256:8047e4575ce8d700370a3301bbfc972896a5845eb62dd535da395b86be95dfad"
+            ],
+            "version": "==0.4.0"
         }
     }
 }

+ 1 - 1
docs/custom_client_config.md

@@ -21,7 +21,7 @@ It's contents (as of writing) are as follows:
   }
 }
 ```
-As you can see from above, this configuration's values are all populated using [facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#information-discovered-from-systems-facts).
+As you can see from above, this configuration's values are all populated using [facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts).
 
 To override this for a single node, `sensu_client_config` can be set in the `host_vars/node_name.domain.name.yml` file. We can also override it for entire groups in `group_vars/group_name.yml`.
 

+ 2 - 2
docs/deploy_plugins.md

@@ -25,10 +25,10 @@ data/static
 ```
 
 ## How handlers, filters, and mutators are deployed
-All three are deployed using Ansible's [template]() module. This allows the use of variables within your configurations, which can come in quite handy!
+All three are deployed using Ansible's [template](https://docs.ansible.com/ansible/latest/modules/template_module.html) module. This allows the use of variables within your configurations, which can come in quite handy!
 
 Let's take a look at the stuff I've got for [Pushover](https://pushover.net/).
-First off, the [handler](https://docs.sensu.io/sensu-core/1.4/guides/intro-to-handlers/) json file `pushover_handler.json.j2`:
+First off, the [handler](https://docs.sensu.io/sensu-core/latest/guides/intro-to-handlers/) json file `pushover_handler.json.j2`:
 ``` json
 {
   "handlers": {

+ 1 - 1
docs/dynamic_checks.md

@@ -4,7 +4,7 @@ One of the awesome features of this role (if I do say so myself) is the deployme
 Have a group of webservers you need to monitor webservices on? Well, I'm sure you've bunched them together in your inventory under the `[webservers]` group, right? Or perhaps you only want to monitor disk space on your production systems; if they're a member of `[production]` within the inventory, you can do this easily.
 
 ## How it works
-Much like [the dynamic datastore](dynamic_data/), I have also defined a static data store within my Ansible codebase, by setting the variable `static_data_store`. By default it's set to the playbook directory, but it can be changed to any location.
+Much like [the dynamic datastore](/dynamic_data/), I have also defined a static data store within my Ansible codebase, by setting the variable `static_data_store`. By default it's set to the playbook directory, but it can be changed to any location.
 Within this static datastore resides the following directory structure:
 ```
 $ tree data/static

+ 32 - 37
docs/index.md

@@ -1,57 +1,55 @@
-# Ansible Sensu [![Ansible Galaxy](https://img.shields.io/badge/galaxy-sensu.sensu-660198.svg?style=flat)](https://galaxy.ansible.com/sensu/sensu/)
+# Sensu [![Ansible Galaxy](https://img.shields.io/badge/galaxy-sensu.sensu-660198.svg?style=flat)](https://galaxy.ansible.com/sensu/sensu/) [![Build Status](https://travis-ci.org/sensu/sensu-ansible.svg?branch=master)](https://travis-ci.org/sensu/sensu-ansible)
 
-An [Ansible](https://ansible.com) role that deploys a full [Sensu](https://sensu.io) stack, a modern, open source monitoring framework.
+[![Join the chat at https://slack.sensu.io/](https://slack.sensu.io/badge.svg)](https://slack.sensu.io/)
 
-## Features
+This role deploys a full [Sensu](https://sensu.io) stack, a modern, open source monitoring framework.
 
-- Deploy a full [Sensu](https://sensu.io) stack, including RabbitMQ, redis, and the [Uchiwa dashboard](https://uchiwa.io/)
+## Features
+- Deploy a full [Sensu](https://sensu.io) stack, including RabbitMQ, redis, and the [Uchiwa dashboard](https://uchiwa.io/#/)
+- Full support for [Sensu Enterprise](https://sensu.io/products/enterprise)
 - Tight integration with the Ansible inventory - deployment of monitoring checks based on inventory grouping
 - Fine grained control over dynamic client configurations
 - Remote plugin deployment
-- Automatic generation and dynamic deployment of self-signed SSL certs for secure communication between your clients and servers
+- Automatic generation and dynamic deployment of SSL certs for secure communication between your clients and servers
 - Highly configurable
 
 ## Batteries included, but not imposed
-Along with deploying the Sensu Server, API and clients, this role can deploy a full stack: [RabbitMQ](https://www.rabbitmq.com/), [redis](https://redis.io), and the [Uchiwa dashboard](https://uchiwa.io/).
-However, if you want to rely on other roles/management methods to deploy/manage these services, [it's nice and easy to integrate this role](integration/).
+Along with deploying the Sensu Server, API and clients, this role can deploy a full stack: [RabbitMQ](http://www.rabbitmq.com/), [redis](http://redis.io), and the [Uchiwa dashboard](https://uchiwa.io/#/).
+However, if you want to rely on other roles/management methods to deploy/manage these services, [it's nice and easy to integrate this role](http://ansible-sensu.readthedocs.io/en/latest/integration/).
 
-## Requirements
+## Documentation [![Documentation](https://readthedocs.org/projects/ansible-sensu/badge/?version=latest)](http://ansible-sensu.readthedocs.io/en/latest/)
+[Read the full documentation](http://ansible-sensu.readthedocs.io/en/latest/) for a comprehensive overview of this role and its powerful features.
 
-This role requires Ansible 2.5
+## Requirements
+This role requires:
+- A supported version of Ansible, see [Ansible version support](#ansible-version-support) for details.
+- The `dynamic_data_store` variable to be set: see [Dynamic Data Store](http://ansible-sensu.readthedocs.io/en/latest/dynamic_data/)
+- If `sensu_include_plugins` is true (the default), the `static_data_store` variable needs to be set: see [Check Deployment](http://ansible-sensu.readthedocs.io/en/latest/dynamic_checks/)
 
 ## Supported Platforms
-
 ### Automatically tested via TravisCI
 
-- [CentOS - 6](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS6.9)
-- [CentOS - 7](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7)
+- [CentOS - 6](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS6.10)
+- [CentOS - 7](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1810)
 - [Debian - 8 (Jessie)](https://wiki.debian.org/DebianJessie)
 - [Debian - 9 (Stretch)](https://wiki.debian.org/DebianStretch)
 - [Ubuntu - 14.04 (Trusty Tahr)](http://releases.ubuntu.com/14.04/)
 - [Ubuntu - 16.04 (Xenial Xerus)](http://releases.ubuntu.com/16.04/)
-- [Ubuntu - 18.04 (Xenial Xerus)](http://releases.ubuntu.com/18.04/)
-- [Fedora - 26](https://docs.fedoraproject.org/f26/release-notes/)
-- [Fedora - 27](https://docs.fedoraproject.org/f27/release-notes/)
-- [Fedora - 28](https://docs.fedoraproject.org/f28/release-notes/)
+- [Ubuntu - 18.04 (Bionic Beaver)](http://releases.ubuntu.com/18.04/)
+- [Fedora - 26](https://docs.fedoraproject.org/en-US/fedora/f26/release-notes/)
+- [Fedora - 27](https://docs.fedoraproject.org/en-US/fedora/f27/release-notes/)
+- [Fedora - 28](https://docs.fedoraproject.org/en-US/fedora/f28/release-notes/)
 - [Amazon Linux](https://aws.amazon.com/amazon-linux-ami/)
 - [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/)
-- [OracleLinux - 7](https://docs.oracle.com/cd/E52668_01/)
 
 ### Supported manually (compatibility not always guaranteed)
-
 - [SmartOS - base-64 15.x.x](https://docs.joyent.com/images/smartos/base#version-15xx)
 - [FreeBSD - 10.3, 11.0 (64-bit only)](https://www.freebsd.org/releases/10.2R/relnotes.html)
 - [OpenBSD - 6.2](https://www.openbsd.org/62.html)
 
 ## Role Variables
 
-All variables have sensible defaults, which can be found in `defaults/main.yml`.
-Head over to [the role variables page](role_variables.md) to review them
-
-## Install (Ansible Galaxy)
-
-To install this role from [Ansible Galaxy](https://galaxy.ansible.com), simpy run:
-`ansible-galaxy install sensu.sensu`
+See [Role Variables](http://ansible-sensu.readthedocs.io/en/latest/role_variables/) for a detailed list of the variables this role uses
 
 ## Example Playbook
 
@@ -60,32 +58,29 @@ To install this role from [Ansible Galaxy](https://galaxy.ansible.com), simpy ru
     roles:
       - role: sensu.sensu
 ```
-
 Or, passing parameter values:
 
 ``` yaml
   - hosts: sensu_masters
     roles:
-      - role: sensu.sensu
-        sensu_master: true
-        sensu_include_dashboard: true
+      - { role: sensu.sensu, sensu_master: true, sensu_include_dashboard: true  }
 ```
 
-## License
+## Ansible version support
+All changes to this role are actively tested against Ansible 2.6 and 2.7 at this time. Ansible 2.5 is required at a minimum.
 
-[MIT](license.md)
 
-## Author Information
+License
+-------
+MIT
 
-Originally created by [Calum MacRae](http://cmacr.ae)
-Supported by the [Sensu Community Ansible Maintainers](https://github.com/sensu-plugins/community/#maintained-areas)
+Author Information
+------------------
+Originally created by [Calum MacRae](https://github.com/cmacrae) and supported by the [Sensu Community Ansible Maintainers](https://github.com/sensu-plugins/community/#maintained-areas)
 
 ### Contributors
-
 See the projects [Contributors page](https://github.com/sensu/sensu-ansible/graphs/contributors)
 
 Feel free to:
-
 [Raise an issue](https://github.com/sensu/sensu-ansible/issues)
-
 [Contribute](https://github.com/sensu/sensu-ansible/pulls)

+ 1 - 1
docs/integration.md

@@ -16,7 +16,7 @@ sensu_rabbitmq_config_path: < the path to the RabbitMQ configuration >
 
 ```
 
-You'll want to ensure you have a directory named `ssl` under your `rabbitmq_config_path` with the Sensu SSL Server CACert, Cert, and Key data inside (the path to this data is defined by the following variables: `sensu_ssl_server_cacert`,  `sensu_ssl_server_cert`,  `sensu_ssl_server_key`. These are typically stored in the [dynamic data store](dynamic_data/)).
+You'll want to ensure you have a directory named `ssl` under your `rabbitmq_config_path` with the Sensu SSL Server CACert, Cert, and Key data inside (the path to this data is defined by the following variables: `sensu_ssl_server_cacert`,  `sensu_ssl_server_cert`,  `sensu_ssl_server_key`. These are typically stored in the [dynamic data store](/dynamic_data/)).
 
 redis
 -----

+ 1 - 1
docs/role_variables.md

@@ -79,7 +79,7 @@ _Note: The above options are intended to provide users with flexibility. This al
 | `sensu_ssl_server_cert` | `"{{ sensu_ssl_tool_base_path }}/server/cert.pem"` ||
 | `sensu_ssl_server_key` | `"{{ sensu_ssl_tool_base_path }}/server/key.pem"` ||
 
-### [Uchiwa Properties](https://docs.uchiwa.io/getting-started/configuration/)
+### [Uchiwa Properties](https://docs.uchiwa.io/uchiwa/1.0/getting-started/configuration/)
 | Name               | Default Value | Description                  |
 |--------------------|---------------|------------------------------|
 | `sensu_uchiwa_dc_name` | _undefined_ | Datacenter name for Uchiwa instance |

+ 5 - 5
docs/testing.md

@@ -19,16 +19,16 @@ tests to more quickly iterate on new features.
 1. Fork the [sensu-ansible](https://github.com/sensu/sensu-ansible) repository
 2. `git clone` your fork of the `sensu-ansible` repository and `cd` into your local clone.
 3. Add the `upstream` repo to your local clone of the repository with the following `git` command:
-```
+```bash
 git remote add upstream https://github.com/sensu/sensu-ansible.git
 ```
 4. Execute `git checkout -b feature/NEW_FEATURE_NAME_HERE` to work on a dedicated branch
 5. Ensure you have a recent version of Docker installed locally: https://docs.docker.com/install/
-6. Ensure you have [pipenv](https://docs.pipenv.org/install/#installing-pipenv) installed.
+6. Ensure you have [pipenv](https://docs.pipenv.org/en/latest/install/#installing-pipenv) installed.
 7. Install this repositories development dependacies with `pipenv install --two --dev` followed by ` gem install rubocop`
 8. Execute the full integration tests for your chosen operating system distribution: ` pipenv run molecule test --scenario-name $OS --driver-name docker --destroy always`
 
-Notes:
-1. Currently, you can set `$OS` above to one of `debian`, `ubuntu`, `centos`, `fedora`, or `amazonlinux`
+##### Notes:
+1. Currently, you can set `$OS` above to one of `debian`, `ubuntu`, `centos`, `fedora`, `amazonlinux`, or `oraclelinux`.
 2. It's faster to iterate by changing `--destroy always` to `--destroy never` such that you don't have to full rebuild the testing infrastructure.
-3. If you want to limit testing to just the Inspec unit tests, you can simply run ` pipenv run molecule verify --scenario-name $OS` to re-run those steps.
+3. If you want to limit testing to just the Inspec unit tests, you can simply run `pipenv run molecule verify --scenario-name $OS` to re-run those steps.

+ 1 - 1
mkdocs.yml

@@ -6,7 +6,7 @@ site_description: An Ansible role to deploy a fully dynamic Sensu stack!
 site_author: Calum MacRae
 
 theme: readthedocs
-pages:
+nav:
   - Home: index.md
   - Usage:
       - Role variables: role_variables.md