Skip to content

Commit

Permalink
Merge pull request #27 from nsg/fix-prov-and-tests
Browse files Browse the repository at this point in the history 
Bring this role up to date!
  • Loading branch information
@nsg
nsg authored Aug 4, 2017
2 parents f6ee682 + e52077d commit 0359e57
Show file tree
Hide file tree
Showing 12 changed files with 317 additions and 300 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Stefan Berggren
Copyright (c) 2014-2017 Stefan Berggren

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
17 changes: 1 addition & 16 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,7 @@ uwsgi_graphite_extraopts:
Role Variables
--------------
* `graphite_user` - The user that carbon and uwsgi is executed as, default: `graphite`
* `graphite_secret_key` - Change this to a random string, default: `UNSAFE_DEFAULT`
* `graphite_time_zone` - Select timezone, default: `America/Los_Angeles`
* `graphite_admin_date_joined`, default: `"2014-07-21T10:11:17.464"`
* `graphite_admin_email`, default: `"root@localhost"`
* `graphite_admin_first_name`, default: `""`
* `graphite_admin_last_name`, default: `""`
* `graphite_admin_last_login`, default: `"2014-07-21T10:11:17.464"`
* `graphite_admin_username`, default: `"admin"`
* `graphite_admin_password`, default: `"admin"`

The default is "60s:1d" (1 day data), this will keep data for 5 years.
If you log a lot of data, you may need to restrict this to a shorter time.
* `graphite_storage_schemas_default_retentions`, default: `"10s:14d,1m:90d,30m:1y,1h:5y"`
See: [defaults/main.yml](https://github.com/nsg/ansible-graphite/blob/master/defaults/main.yml)
Example Playbook
-------------------------
Expand All @@ -66,8 +53,6 @@ Example Playbook
- { role: nsg.graphite, graphite_secret_key: 'dgdgdfgasg' }
```
... or place graphite_secret_key in group_vars, host_vars, inventory...
License
-------
Expand Down
166 changes: 83 additions & 83 deletions defaults/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,103 @@
---
graphite_install_version: 0.9.15

graphite_user: graphite
graphite_user: graphite
graphite_secret_key: UNSAFE_DEFAULT
graphite_time_zone: "UTC"
graphite_time_zone: UTC

graphite_admin_date_joined: "2014-07-21T10:11:17.464"
graphite_admin_email: "root@example.com"
graphite_admin_first_name: ""
graphite_admin_last_name: ""
graphite_admin_last_login: "2014-07-21T10:11:17.464"
graphite_admin_username: "admin"
graphite_admin_password: "admin"
graphite_admin_email: "root@example.com"
graphite_admin_first_name: ""
graphite_admin_last_name: ""
graphite_admin_last_login: "2014-07-21T10:11:17.464"
graphite_admin_username: admin
graphite_admin_password: admin

# The default is "60s:1d" (1 day data), this will keep data for 5 years.
# If you log a lot of data, you may need to restrict this to a shorter time.
graphite_storage_schemas_default_retentions: "10s:14d,1m:90d,30m:1y,1h:5y"
graphite_storage_schemas_carbon_retentions: 60:90d
graphite_storage_schemas: []

graphite_cache_amqp_exchange: graphite
graphite_cache_amqp_host: localhost
graphite_cache_amqp_metric_name_in_body: false
graphite_cache_amqp_password: guest
graphite_cache_amqp_port: 5672
graphite_cache_amqp_user: guest
graphite_cache_amqp_verbose: false
graphite_cache_amqp_vhost: /
graphite_cache_bind_patterns: "#"
graphite_cache_cache_query_interface: 0.0.0.0
graphite_cache_cache_query_port: 7002
graphite_cache_cache_write_strategy: sorted
graphite_cache_carbon_metric_interval: 60
graphite_cache_carbon_metric_prefix: carbon
graphite_cache_enable_amqp: false
graphite_cache_enable_log_rotation: true
graphite_cache_enable_manhole: false
graphite_cache_enable_udp_listener: false
graphite_cache_line_receiver_interface: 0.0.0.0
graphite_cache_line_receiver_port: 2003
graphite_cache_local_data_dir: /opt/graphite/storage/whisper
graphite_cache_log_cache_hits: false
graphite_cache_log_cache_queue_sorts: true
graphite_cache_log_listener_connections: true
graphite_cache_log_updates: false
graphite_cache_manhole_interface: 127.0.0.1
graphite_cache_manhole_port: 7222
graphite_cache_manhole_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAABiwAaAIEAoxN0sv/e4eZCPpi3N3KYvyzRaBaMeS2RsOQ/cDuKv11dlNzVeiyc3RFmCv5Rjwn/lQ79y0zyHxw67qLyhQ/kDzINc4cY41ivuQXm2tPmgvexdrBv5nsfEpjs3gLZfJnyvlcVyWK/lId8WUvEWSWHTzsbtmXAF2raJMdgLTbQ8wE=
graphite_cache_manhole_user: admin
graphite_cache_max_cache_size: inf
graphite_cache_max_creates_per_minute: 50
graphite_cache_max_updates_per_second: 500
graphite_cache_amqp_exchange: graphite
graphite_cache_amqp_host: localhost
graphite_cache_amqp_metric_name_in_body: false
graphite_cache_amqp_password: guest
graphite_cache_amqp_port: 5672
graphite_cache_amqp_user: guest
graphite_cache_amqp_verbose: false
graphite_cache_amqp_vhost: /
graphite_cache_bind_patterns: "#"
graphite_cache_cache_query_interface: 0.0.0.0
graphite_cache_cache_query_port: 7002
graphite_cache_cache_write_strategy: sorted
graphite_cache_carbon_metric_interval: 60
graphite_cache_carbon_metric_prefix: carbon
graphite_cache_enable_amqp: false
graphite_cache_enable_log_rotation: true
graphite_cache_enable_udp_listener: false
graphite_cache_line_receiver_interface: 0.0.0.0
graphite_cache_line_receiver_port: 2003
graphite_cache_local_data_dir: /opt/graphite/storage/whisper
graphite_cache_log_cache_hits: false
graphite_cache_log_cache_queue_sorts: true
graphite_cache_log_listener_connections: true
graphite_cache_log_updates: false
graphite_cache_enable_manhole: false
graphite_cache_manhole_interface: 127.0.0.1
graphite_cache_manhole_port: 7222
graphite_cache_manhole_public_key: ssh-rsa AAAAB3NzaC1y...
graphite_cache_manhole_user: admin
graphite_cache_max_cache_size: inf
graphite_cache_max_creates_per_minute: 50
graphite_cache_max_updates_per_second: 500
graphite_cache_max_updates_per_second_on_shutdown: 1000
graphite_cache_pickle_receiver_interface: 0.0.0.0
graphite_cache_pickle_receiver_port: 2004
graphite_cache_udp_receiver_interface: 0.0.0.0
graphite_cache_udp_receiver_port: 2003
graphite_cache_use_flow_control: true
graphite_cache_use_insecure_unpickler: false
graphite_cache_use_whitelist: false
#graphite_cache_user:
graphite_cache_whisper_autoflush: false
graphite_cache_whisper_fallocate_create: true
graphite_cache_whisper_lock_writes: false
graphite_cache_whisper_sparse_create: false
graphite_cache_pickle_receiver_interface: 0.0.0.0
graphite_cache_pickle_receiver_port: 2004
graphite_cache_udp_receiver_interface: 0.0.0.0
graphite_cache_udp_receiver_port: 2003
graphite_cache_use_flow_control: true
graphite_cache_use_insecure_unpickler: false
graphite_cache_use_whitelist: false
# graphite_cache_user:
graphite_cache_whisper_autoflush: false
graphite_cache_whisper_fallocate_create: true
graphite_cache_whisper_lock_writes: false
graphite_cache_whisper_sparse_create: false

graphite_relay_carbon_metric_interval: 60
graphite_relay_carbon_metric_prefix: carbon
graphite_relay_destinations: 127.0.0.1:2004
graphite_relay_line_receiver_interface: 0.0.0.0
graphite_relay_line_receiver_port: 2013
graphite_relay_log_listener_connections: true
graphite_relay_max_datapoints_per_message: 500
graphite_relay_max_queue_size: 10000
graphite_relay_pickle_receiver_interface: 0.0.0.0
graphite_relay_pickle_receiver_port: 2014
graphite_relay_relay_method: rules
graphite_relay_replication_factor: 1
graphite_relay_use_flow_control: true
graphite_relay_use_whitelist: false
#graphite_relay_user:
graphite_relay_carbon_metric_interval: 60
graphite_relay_carbon_metric_prefix: carbon
graphite_relay_destinations: 127.0.0.1:2004
graphite_relay_line_receiver_interface: 0.0.0.0
graphite_relay_line_receiver_port: 2013
graphite_relay_log_listener_connections: true
graphite_relay_max_datapoints_per_message: 500
graphite_relay_max_queue_size: 10000
graphite_relay_pickle_receiver_interface: 0.0.0.0
graphite_relay_pickle_receiver_port: 2014
graphite_relay_relay_method: rules
graphite_relay_replication_factor: 1
graphite_relay_use_flow_control: true
graphite_relay_use_whitelist: false
# graphite_relay_user:

graphite_aggregator_carbon_metric_interval: 60
graphite_aggregator_carbon_metric_prefix: carbon
graphite_aggregator_destinations: 127.0.0.1:2004
graphite_aggregator_forward_all: true
graphite_aggregator_line_receiver_interface: 0.0.0.0
graphite_aggregator_line_receiver_port: 2023
graphite_aggregator_log_listener_connections: true
graphite_aggregator_max_aggregation_intervals: 5
graphite_aggregator_carbon_metric_interval: 60
graphite_aggregator_carbon_metric_prefix: carbon
graphite_aggregator_destinations: 127.0.0.1:2004
graphite_aggregator_forward_all: true
graphite_aggregator_line_receiver_interface: 0.0.0.0
graphite_aggregator_line_receiver_port: 2023
graphite_aggregator_log_listener_connections: true
graphite_aggregator_max_aggregation_intervals: 5
graphite_aggregator_max_datapoints_per_message: 500
graphite_aggregator_max_queue_size: 10000
graphite_aggregator_pickle_receiver_interface: 0.0.0.0
graphite_aggregator_pickle_receiver_port: 2024
graphite_aggregator_replication_factor: 1
graphite_aggregator_use_flow_control: true
graphite_aggregator_use_whitelist: false
#graphite_aggregator_user:
graphite_aggregator_write_back_frequency: 0
graphite_aggregator_max_queue_size: 10000
graphite_aggregator_pickle_receiver_interface: 0.0.0.0
graphite_aggregator_pickle_receiver_port: 2024
graphite_aggregator_replication_factor: 1
graphite_aggregator_use_flow_control: true
graphite_aggregator_use_whitelist: false
# graphite_aggregator_user:
graphite_aggregator_write_back_frequency: 0

# Optional extra options for uwsgi_graphite.ini
uwsgi_graphite_extraopts: []
Expand Down
145 changes: 29 additions & 116 deletions meta/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,124 +3,37 @@ galaxy_info:
author: Stefan Berggren
description: Graphite ansible role
company:
# Some suggested licenses:
# - BSD (default)
# - MIT
# - GPLv2
# - GPLv3
# - Apache
# - CC-BY
license: MIT
min_ansible_version: 2.1.4
#
# Below are all platforms currently available. Just uncomment
# the ones that apply to your role. If you don't see your
# platform on this list, let us know and we'll get it added!
#
platforms:
- name: EL
versions:
# - all
# - 5
- 6
- 7
#- name: GenericUNIX
# versions:
# - all
# - any
#- name: Fedora
# versions:
# - all
# - 16
# - 17
# - 18
# - 19
# - 20
#- name: opensuse
# versions:
# - all
# - 12.1
# - 12.2
# - 12.3
# - 13.1
# - 13.2
#- name: Amazon
# versions:
# - all
# - 2013.03
# - 2013.09
#- name: GenericBSD
# versions:
# - all
# - any
#- name: FreeBSD
# versions:
# - all
# - 8.0
# - 8.1
# - 8.2
# - 8.3
# - 8.4
# - 9.0
# - 9.1
# - 9.1
# - 9.2
- name: Ubuntu
versions:
# - all
# - lucid
# - maverick
# - natty
# - oneiric
# - precise
# - quantal
# - raring
# - saucy
- trusty
- xenial
#- name: SLES
# versions:
# - all
# - 10SP3
# - 10SP4
# - 11
# - 11SP1
# - 11SP2
# - 11SP3
#- name: GenericLinux
# versions:
# - all
# - any
- name: Debian
versions:
# - all
# - etch
# - lenny
# - squeeze
- wheezy
- jessie
#
# Below are all categories currently available. Just as with
# the platforms above, uncomment those that apply to your role.
#
- name: EL
versions:
- 6
- 7
# - name: Fedora
# versions:
# - all
# - 16
# - 17
# - 18
# - 19
# - 20
# - name: opensuse
# versions:
# - all
# - 12.1
# - 12.2
# - 12.3
# - 13.1
# - 13.2
- name: Ubuntu
versions:
- trusty
- xenial
- name: Debian
versions:
- jessie
- stretch
categories:
#- cloud
#- cloud:ec2
#- cloud:gce
#- cloud:rax
#- clustering
#- database
#- database:nosql
#- database:sql
#- development
- monitoring
#- networking
#- packaging
#- system
#- web
- monitoring
dependencies: []
# List your role dependencies here, one per line. Only
# dependencies available via galaxy should be listed here.
# Be sure to remove the '[]' above if you add dependencies
# to this list.

Loading

0 comments on commit 0359e57

Please sign in to comment.