Skip to content

Commit 0359e57

Browse files
nsgnsg
authored
Merge pull request #27 from nsg/fix-prov-and-tests
Bring this role up to date!
2 parents f6ee682 + e52077d commit 0359e57

File tree

12 files changed

+317
-300
lines changed

12 files changed

+317
-300
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 Stefan Berggren
3+
Copyright (c) 2014-2017 Stefan Berggren
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+1-16
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,7 @@ uwsgi_graphite_extraopts:
4242
Role Variables
4343
--------------
4444
45-
* `graphite_user` - The user that carbon and uwsgi is executed as, default: `graphite`
46-
* `graphite_secret_key` - Change this to a random string, default: `UNSAFE_DEFAULT`
47-
* `graphite_time_zone` - Select timezone, default: `America/Los_Angeles`
48-
* `graphite_admin_date_joined`, default: `"2014-07-21T10:11:17.464"`
49-
* `graphite_admin_email`, default: `"root@localhost"`
50-
* `graphite_admin_first_name`, default: `""`
51-
* `graphite_admin_last_name`, default: `""`
52-
* `graphite_admin_last_login`, default: `"2014-07-21T10:11:17.464"`
53-
* `graphite_admin_username`, default: `"admin"`
54-
* `graphite_admin_password`, default: `"admin"`
55-
56-
The default is "60s:1d" (1 day data), this will keep data for 5 years.
57-
If you log a lot of data, you may need to restrict this to a shorter time.
58-
* `graphite_storage_schemas_default_retentions`, default: `"10s:14d,1m:90d,30m:1y,1h:5y"`
45+
See: [defaults/main.yml](https://github.com/nsg/ansible-graphite/blob/master/defaults/main.yml)
5946
6047
Example Playbook
6148
-------------------------
@@ -66,8 +53,6 @@ Example Playbook
6653
- { role: nsg.graphite, graphite_secret_key: 'dgdgdfgasg' }
6754
```
6855
69-
... or place graphite_secret_key in group_vars, host_vars, inventory...
70-
7156
License
7257
-------
7358

‎defaults/main.yml

+83-83
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
11
---
22
graphite_install_version: 0.9.15
33

4-
graphite_user: graphite
4+
graphite_user: graphite
55
graphite_secret_key: UNSAFE_DEFAULT
6-
graphite_time_zone: "UTC"
6+
graphite_time_zone: UTC
77

88
graphite_admin_date_joined: "2014-07-21T10:11:17.464"
9-
graphite_admin_email: "[email protected]"
10-
graphite_admin_first_name: ""
11-
graphite_admin_last_name: ""
12-
graphite_admin_last_login: "2014-07-21T10:11:17.464"
13-
graphite_admin_username: "admin"
14-
graphite_admin_password: "admin"
9+
graphite_admin_email: "[email protected]"
10+
graphite_admin_first_name: ""
11+
graphite_admin_last_name: ""
12+
graphite_admin_last_login: "2014-07-21T10:11:17.464"
13+
graphite_admin_username: admin
14+
graphite_admin_password: admin
1515

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

22-
graphite_cache_amqp_exchange: graphite
23-
graphite_cache_amqp_host: localhost
24-
graphite_cache_amqp_metric_name_in_body: false
25-
graphite_cache_amqp_password: guest
26-
graphite_cache_amqp_port: 5672
27-
graphite_cache_amqp_user: guest
28-
graphite_cache_amqp_verbose: false
29-
graphite_cache_amqp_vhost: /
30-
graphite_cache_bind_patterns: "#"
31-
graphite_cache_cache_query_interface: 0.0.0.0
32-
graphite_cache_cache_query_port: 7002
33-
graphite_cache_cache_write_strategy: sorted
34-
graphite_cache_carbon_metric_interval: 60
35-
graphite_cache_carbon_metric_prefix: carbon
36-
graphite_cache_enable_amqp: false
37-
graphite_cache_enable_log_rotation: true
38-
graphite_cache_enable_manhole: false
39-
graphite_cache_enable_udp_listener: false
40-
graphite_cache_line_receiver_interface: 0.0.0.0
41-
graphite_cache_line_receiver_port: 2003
42-
graphite_cache_local_data_dir: /opt/graphite/storage/whisper
43-
graphite_cache_log_cache_hits: false
44-
graphite_cache_log_cache_queue_sorts: true
45-
graphite_cache_log_listener_connections: true
46-
graphite_cache_log_updates: false
47-
graphite_cache_manhole_interface: 127.0.0.1
48-
graphite_cache_manhole_port: 7222
49-
graphite_cache_manhole_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAABiwAaAIEAoxN0sv/e4eZCPpi3N3KYvyzRaBaMeS2RsOQ/cDuKv11dlNzVeiyc3RFmCv5Rjwn/lQ79y0zyHxw67qLyhQ/kDzINc4cY41ivuQXm2tPmgvexdrBv5nsfEpjs3gLZfJnyvlcVyWK/lId8WUvEWSWHTzsbtmXAF2raJMdgLTbQ8wE=
50-
graphite_cache_manhole_user: admin
51-
graphite_cache_max_cache_size: inf
52-
graphite_cache_max_creates_per_minute: 50
53-
graphite_cache_max_updates_per_second: 500
22+
graphite_cache_amqp_exchange: graphite
23+
graphite_cache_amqp_host: localhost
24+
graphite_cache_amqp_metric_name_in_body: false
25+
graphite_cache_amqp_password: guest
26+
graphite_cache_amqp_port: 5672
27+
graphite_cache_amqp_user: guest
28+
graphite_cache_amqp_verbose: false
29+
graphite_cache_amqp_vhost: /
30+
graphite_cache_bind_patterns: "#"
31+
graphite_cache_cache_query_interface: 0.0.0.0
32+
graphite_cache_cache_query_port: 7002
33+
graphite_cache_cache_write_strategy: sorted
34+
graphite_cache_carbon_metric_interval: 60
35+
graphite_cache_carbon_metric_prefix: carbon
36+
graphite_cache_enable_amqp: false
37+
graphite_cache_enable_log_rotation: true
38+
graphite_cache_enable_udp_listener: false
39+
graphite_cache_line_receiver_interface: 0.0.0.0
40+
graphite_cache_line_receiver_port: 2003
41+
graphite_cache_local_data_dir: /opt/graphite/storage/whisper
42+
graphite_cache_log_cache_hits: false
43+
graphite_cache_log_cache_queue_sorts: true
44+
graphite_cache_log_listener_connections: true
45+
graphite_cache_log_updates: false
46+
graphite_cache_enable_manhole: false
47+
graphite_cache_manhole_interface: 127.0.0.1
48+
graphite_cache_manhole_port: 7222
49+
graphite_cache_manhole_public_key: ssh-rsa AAAAB3NzaC1y...
50+
graphite_cache_manhole_user: admin
51+
graphite_cache_max_cache_size: inf
52+
graphite_cache_max_creates_per_minute: 50
53+
graphite_cache_max_updates_per_second: 500
5454
graphite_cache_max_updates_per_second_on_shutdown: 1000
55-
graphite_cache_pickle_receiver_interface: 0.0.0.0
56-
graphite_cache_pickle_receiver_port: 2004
57-
graphite_cache_udp_receiver_interface: 0.0.0.0
58-
graphite_cache_udp_receiver_port: 2003
59-
graphite_cache_use_flow_control: true
60-
graphite_cache_use_insecure_unpickler: false
61-
graphite_cache_use_whitelist: false
62-
#graphite_cache_user:
63-
graphite_cache_whisper_autoflush: false
64-
graphite_cache_whisper_fallocate_create: true
65-
graphite_cache_whisper_lock_writes: false
66-
graphite_cache_whisper_sparse_create: false
55+
graphite_cache_pickle_receiver_interface: 0.0.0.0
56+
graphite_cache_pickle_receiver_port: 2004
57+
graphite_cache_udp_receiver_interface: 0.0.0.0
58+
graphite_cache_udp_receiver_port: 2003
59+
graphite_cache_use_flow_control: true
60+
graphite_cache_use_insecure_unpickler: false
61+
graphite_cache_use_whitelist: false
62+
# graphite_cache_user:
63+
graphite_cache_whisper_autoflush: false
64+
graphite_cache_whisper_fallocate_create: true
65+
graphite_cache_whisper_lock_writes: false
66+
graphite_cache_whisper_sparse_create: false
6767

68-
graphite_relay_carbon_metric_interval: 60
69-
graphite_relay_carbon_metric_prefix: carbon
70-
graphite_relay_destinations: 127.0.0.1:2004
71-
graphite_relay_line_receiver_interface: 0.0.0.0
72-
graphite_relay_line_receiver_port: 2013
73-
graphite_relay_log_listener_connections: true
74-
graphite_relay_max_datapoints_per_message: 500
75-
graphite_relay_max_queue_size: 10000
76-
graphite_relay_pickle_receiver_interface: 0.0.0.0
77-
graphite_relay_pickle_receiver_port: 2014
78-
graphite_relay_relay_method: rules
79-
graphite_relay_replication_factor: 1
80-
graphite_relay_use_flow_control: true
81-
graphite_relay_use_whitelist: false
82-
#graphite_relay_user:
68+
graphite_relay_carbon_metric_interval: 60
69+
graphite_relay_carbon_metric_prefix: carbon
70+
graphite_relay_destinations: 127.0.0.1:2004
71+
graphite_relay_line_receiver_interface: 0.0.0.0
72+
graphite_relay_line_receiver_port: 2013
73+
graphite_relay_log_listener_connections: true
74+
graphite_relay_max_datapoints_per_message: 500
75+
graphite_relay_max_queue_size: 10000
76+
graphite_relay_pickle_receiver_interface: 0.0.0.0
77+
graphite_relay_pickle_receiver_port: 2014
78+
graphite_relay_relay_method: rules
79+
graphite_relay_replication_factor: 1
80+
graphite_relay_use_flow_control: true
81+
graphite_relay_use_whitelist: false
82+
# graphite_relay_user:
8383

84-
graphite_aggregator_carbon_metric_interval: 60
85-
graphite_aggregator_carbon_metric_prefix: carbon
86-
graphite_aggregator_destinations: 127.0.0.1:2004
87-
graphite_aggregator_forward_all: true
88-
graphite_aggregator_line_receiver_interface: 0.0.0.0
89-
graphite_aggregator_line_receiver_port: 2023
90-
graphite_aggregator_log_listener_connections: true
91-
graphite_aggregator_max_aggregation_intervals: 5
84+
graphite_aggregator_carbon_metric_interval: 60
85+
graphite_aggregator_carbon_metric_prefix: carbon
86+
graphite_aggregator_destinations: 127.0.0.1:2004
87+
graphite_aggregator_forward_all: true
88+
graphite_aggregator_line_receiver_interface: 0.0.0.0
89+
graphite_aggregator_line_receiver_port: 2023
90+
graphite_aggregator_log_listener_connections: true
91+
graphite_aggregator_max_aggregation_intervals: 5
9292
graphite_aggregator_max_datapoints_per_message: 500
93-
graphite_aggregator_max_queue_size: 10000
94-
graphite_aggregator_pickle_receiver_interface: 0.0.0.0
95-
graphite_aggregator_pickle_receiver_port: 2024
96-
graphite_aggregator_replication_factor: 1
97-
graphite_aggregator_use_flow_control: true
98-
graphite_aggregator_use_whitelist: false
99-
#graphite_aggregator_user:
100-
graphite_aggregator_write_back_frequency: 0
93+
graphite_aggregator_max_queue_size: 10000
94+
graphite_aggregator_pickle_receiver_interface: 0.0.0.0
95+
graphite_aggregator_pickle_receiver_port: 2024
96+
graphite_aggregator_replication_factor: 1
97+
graphite_aggregator_use_flow_control: true
98+
graphite_aggregator_use_whitelist: false
99+
# graphite_aggregator_user:
100+
graphite_aggregator_write_back_frequency: 0
101101

102102
# Optional extra options for uwsgi_graphite.ini
103103
uwsgi_graphite_extraopts: []

‎meta/main.yml

+29-116
Original file line numberDiff line numberDiff line change
@@ -3,124 +3,37 @@ galaxy_info:
33
author: Stefan Berggren
44
description: Graphite ansible role
55
company:
6-
# Some suggested licenses:
7-
# - BSD (default)
8-
# - MIT
9-
# - GPLv2
10-
# - GPLv3
11-
# - Apache
12-
# - CC-BY
136
license: MIT
147
min_ansible_version: 2.1.4
15-
#
16-
# Below are all platforms currently available. Just uncomment
17-
# the ones that apply to your role. If you don't see your
18-
# platform on this list, let us know and we'll get it added!
19-
#
208
platforms:
21-
- name: EL
22-
versions:
23-
# - all
24-
# - 5
25-
- 6
26-
- 7
27-
#- name: GenericUNIX
28-
# versions:
29-
# - all
30-
# - any
31-
#- name: Fedora
32-
# versions:
33-
# - all
34-
# - 16
35-
# - 17
36-
# - 18
37-
# - 19
38-
# - 20
39-
#- name: opensuse
40-
# versions:
41-
# - all
42-
# - 12.1
43-
# - 12.2
44-
# - 12.3
45-
# - 13.1
46-
# - 13.2
47-
#- name: Amazon
48-
# versions:
49-
# - all
50-
# - 2013.03
51-
# - 2013.09
52-
#- name: GenericBSD
53-
# versions:
54-
# - all
55-
# - any
56-
#- name: FreeBSD
57-
# versions:
58-
# - all
59-
# - 8.0
60-
# - 8.1
61-
# - 8.2
62-
# - 8.3
63-
# - 8.4
64-
# - 9.0
65-
# - 9.1
66-
# - 9.1
67-
# - 9.2
68-
- name: Ubuntu
69-
versions:
70-
# - all
71-
# - lucid
72-
# - maverick
73-
# - natty
74-
# - oneiric
75-
# - precise
76-
# - quantal
77-
# - raring
78-
# - saucy
79-
- trusty
80-
- xenial
81-
#- name: SLES
82-
# versions:
83-
# - all
84-
# - 10SP3
85-
# - 10SP4
86-
# - 11
87-
# - 11SP1
88-
# - 11SP2
89-
# - 11SP3
90-
#- name: GenericLinux
91-
# versions:
92-
# - all
93-
# - any
94-
- name: Debian
95-
versions:
96-
# - all
97-
# - etch
98-
# - lenny
99-
# - squeeze
100-
- wheezy
101-
- jessie
102-
#
103-
# Below are all categories currently available. Just as with
104-
# the platforms above, uncomment those that apply to your role.
105-
#
9+
- name: EL
10+
versions:
11+
- 6
12+
- 7
13+
# - name: Fedora
14+
# versions:
15+
# - all
16+
# - 16
17+
# - 17
18+
# - 18
19+
# - 19
20+
# - 20
21+
# - name: opensuse
22+
# versions:
23+
# - all
24+
# - 12.1
25+
# - 12.2
26+
# - 12.3
27+
# - 13.1
28+
# - 13.2
29+
- name: Ubuntu
30+
versions:
31+
- trusty
32+
- xenial
33+
- name: Debian
34+
versions:
35+
- jessie
36+
- stretch
10637
categories:
107-
#- cloud
108-
#- cloud:ec2
109-
#- cloud:gce
110-
#- cloud:rax
111-
#- clustering
112-
#- database
113-
#- database:nosql
114-
#- database:sql
115-
#- development
116-
- monitoring
117-
#- networking
118-
#- packaging
119-
#- system
120-
#- web
38+
- monitoring
12139
dependencies: []
122-
# List your role dependencies here, one per line. Only
123-
# dependencies available via galaxy should be listed here.
124-
# Be sure to remove the '[]' above if you add dependencies
125-
# to this list.
126-

0 commit comments

Comments
 (0)