diff --git a/ansible/roles/consul/tasks/get_consul_manager_ip.py b/ansible/roles/consul/tasks/get_consul_manager_ip.py index 96d21f975..0dfca056d 100755 --- a/ansible/roles/consul/tasks/get_consul_manager_ip.py +++ b/ansible/roles/consul/tasks/get_consul_manager_ip.py @@ -1,4 +1,4 @@ -#!/srv/newsblur/venv/newsblur3/bin/python +#!/usr/bin/env python import os import digitalocean diff --git a/config/munin/aws_elb_latency b/archive/munin/aws_elb_latency similarity index 100% rename from config/munin/aws_elb_latency rename to archive/munin/aws_elb_latency diff --git a/config/munin/aws_elb_requests b/archive/munin/aws_elb_requests similarity index 100% rename from config/munin/aws_elb_requests rename to archive/munin/aws_elb_requests diff --git a/config/munin/aws_sqs_queue_length_ b/archive/munin/aws_sqs_queue_length_ similarity index 100% rename from config/munin/aws_sqs_queue_length_ rename to archive/munin/aws_sqs_queue_length_ diff --git a/config/munin/cassandra_cfcounts b/archive/munin/cassandra_cfcounts similarity index 100% rename from config/munin/cassandra_cfcounts rename to archive/munin/cassandra_cfcounts diff --git a/config/munin/cassandra_key_cache_ratio b/archive/munin/cassandra_key_cache_ratio similarity index 100% rename from config/munin/cassandra_key_cache_ratio rename to archive/munin/cassandra_key_cache_ratio diff --git a/config/munin/cassandra_latency b/archive/munin/cassandra_latency similarity index 100% rename from config/munin/cassandra_latency rename to archive/munin/cassandra_latency diff --git a/config/munin/cassandra_load b/archive/munin/cassandra_load similarity index 100% rename from config/munin/cassandra_load rename to archive/munin/cassandra_load diff --git a/config/munin/cassandra_pending b/archive/munin/cassandra_pending similarity index 100% rename from config/munin/cassandra_pending rename to archive/munin/cassandra_pending diff --git a/config/munin/ddwrt_wl_rate b/archive/munin/ddwrt_wl_rate similarity index 100% rename from config/munin/ddwrt_wl_rate rename to archive/munin/ddwrt_wl_rate diff --git a/config/munin/ddwrt_wl_signal b/archive/munin/ddwrt_wl_signal similarity index 100% rename from config/munin/ddwrt_wl_signal rename to archive/munin/ddwrt_wl_signal diff --git a/config/munin/gearman_connections b/archive/munin/gearman_connections similarity index 100% rename from config/munin/gearman_connections rename to archive/munin/gearman_connections diff --git a/config/munin/gearman_queues b/archive/munin/gearman_queues similarity index 100% rename from config/munin/gearman_queues rename to archive/munin/gearman_queues diff --git a/config/munin/haproxy b/archive/munin/haproxy similarity index 100% rename from config/munin/haproxy rename to archive/munin/haproxy diff --git a/config/munin/hookbox b/archive/munin/hookbox similarity index 100% rename from config/munin/hookbox rename to archive/munin/hookbox diff --git a/config/munin/loadavg b/archive/munin/loadavg similarity index 100% rename from config/munin/loadavg rename to archive/munin/loadavg diff --git a/config/munin/memcached_bytes b/archive/munin/memcached_bytes similarity index 100% rename from config/munin/memcached_bytes rename to archive/munin/memcached_bytes diff --git a/config/munin/memcached_connections b/archive/munin/memcached_connections similarity index 100% rename from config/munin/memcached_connections rename to archive/munin/memcached_connections diff --git a/config/munin/memcached_curr_items b/archive/munin/memcached_curr_items similarity index 100% rename from config/munin/memcached_curr_items rename to archive/munin/memcached_curr_items diff --git a/config/munin/memcached_items b/archive/munin/memcached_items similarity index 100% rename from config/munin/memcached_items rename to archive/munin/memcached_items diff --git a/config/munin/memcached_queries b/archive/munin/memcached_queries similarity index 100% rename from config/munin/memcached_queries rename to archive/munin/memcached_queries diff --git a/config/munin/mongo_btree b/archive/munin/mongo_btree similarity index 100% rename from config/munin/mongo_btree rename to archive/munin/mongo_btree diff --git a/config/munin/mongo_indexsize b/archive/munin/mongo_indexsize similarity index 100% rename from config/munin/mongo_indexsize rename to archive/munin/mongo_indexsize diff --git a/config/munin/mongo_mem b/archive/munin/mongo_mem similarity index 100% rename from config/munin/mongo_mem rename to archive/munin/mongo_mem diff --git a/config/munin/mongo_ops b/archive/munin/mongo_ops similarity index 100% rename from config/munin/mongo_ops rename to archive/munin/mongo_ops diff --git a/config/munin/mongodb_conn b/archive/munin/mongodb_conn similarity index 100% rename from config/munin/mongodb_conn rename to archive/munin/mongodb_conn diff --git a/config/munin/mongodb_heap_usage b/archive/munin/mongodb_heap_usage similarity index 100% rename from config/munin/mongodb_heap_usage rename to archive/munin/mongodb_heap_usage diff --git a/config/munin/mongodb_objects_newsblur b/archive/munin/mongodb_objects_newsblur similarity index 100% rename from config/munin/mongodb_objects_newsblur rename to archive/munin/mongodb_objects_newsblur diff --git a/config/munin/mongodb_ops b/archive/munin/mongodb_ops similarity index 100% rename from config/munin/mongodb_ops rename to archive/munin/mongodb_ops diff --git a/config/munin/mongodb_page_faults b/archive/munin/mongodb_page_faults similarity index 100% rename from config/munin/mongodb_page_faults rename to archive/munin/mongodb_page_faults diff --git a/config/munin/mongodb_queues b/archive/munin/mongodb_queues similarity index 100% rename from config/munin/mongodb_queues rename to archive/munin/mongodb_queues diff --git a/config/munin/mongodb_replset_lag b/archive/munin/mongodb_replset_lag similarity index 100% rename from config/munin/mongodb_replset_lag rename to archive/munin/mongodb_replset_lag diff --git a/config/munin/mongodb_size_newsblur b/archive/munin/mongodb_size_newsblur similarity index 100% rename from config/munin/mongodb_size_newsblur rename to archive/munin/mongodb_size_newsblur diff --git a/vendor/munin/__init__.py b/archive/munin/munin/__init__.py similarity index 100% rename from vendor/munin/__init__.py rename to archive/munin/munin/__init__.py diff --git a/vendor/munin/cassandra.py b/archive/munin/munin/cassandra.py similarity index 100% rename from vendor/munin/cassandra.py rename to archive/munin/munin/cassandra.py diff --git a/vendor/munin/ddwrt.py b/archive/munin/munin/ddwrt.py similarity index 100% rename from vendor/munin/ddwrt.py rename to archive/munin/munin/ddwrt.py diff --git a/vendor/munin/gearman.py b/archive/munin/munin/gearman.py similarity index 100% rename from vendor/munin/gearman.py rename to archive/munin/munin/gearman.py diff --git a/vendor/munin/memcached.py b/archive/munin/munin/memcached.py similarity index 100% rename from vendor/munin/memcached.py rename to archive/munin/munin/memcached.py diff --git a/vendor/munin/mongodb.py b/archive/munin/munin/mongodb.py similarity index 100% rename from vendor/munin/mongodb.py rename to archive/munin/munin/mongodb.py diff --git a/vendor/munin/mysql.py b/archive/munin/munin/mysql.py similarity index 100% rename from vendor/munin/mysql.py rename to archive/munin/munin/mysql.py diff --git a/vendor/munin/nginx.py b/archive/munin/munin/nginx.py similarity index 100% rename from vendor/munin/nginx.py rename to archive/munin/munin/nginx.py diff --git a/vendor/munin/pgbouncer.py b/archive/munin/munin/pgbouncer.py similarity index 100% rename from vendor/munin/pgbouncer.py rename to archive/munin/munin/pgbouncer.py diff --git a/vendor/munin/postgres.py b/archive/munin/munin/postgres.py similarity index 100% rename from vendor/munin/postgres.py rename to archive/munin/munin/postgres.py diff --git a/vendor/munin/redis.py b/archive/munin/munin/redis.py similarity index 100% rename from vendor/munin/redis.py rename to archive/munin/munin/redis.py diff --git a/vendor/munin/riak.py b/archive/munin/munin/riak.py similarity index 100% rename from vendor/munin/riak.py rename to archive/munin/munin/riak.py diff --git a/config/munin/mysql_dbrows_ b/archive/munin/mysql_dbrows_ similarity index 100% rename from config/munin/mysql_dbrows_ rename to archive/munin/mysql_dbrows_ diff --git a/config/munin/mysql_dbsize_ b/archive/munin/mysql_dbsize_ similarity index 100% rename from config/munin/mysql_dbsize_ rename to archive/munin/mysql_dbsize_ diff --git a/config/munin/nginx_connections b/archive/munin/nginx_connections similarity index 100% rename from config/munin/nginx_connections rename to archive/munin/nginx_connections diff --git a/config/munin/nginx_requests b/archive/munin/nginx_requests similarity index 100% rename from config/munin/nginx_requests rename to archive/munin/nginx_requests diff --git a/config/munin/path_size b/archive/munin/path_size similarity index 100% rename from config/munin/path_size rename to archive/munin/path_size diff --git a/config/munin/pg_newsblur_connections b/archive/munin/pg_newsblur_connections similarity index 100% rename from config/munin/pg_newsblur_connections rename to archive/munin/pg_newsblur_connections diff --git a/config/munin/pg_newsblur_db_size b/archive/munin/pg_newsblur_db_size similarity index 100% rename from config/munin/pg_newsblur_db_size rename to archive/munin/pg_newsblur_db_size diff --git a/config/munin/pg_newsblur_locks b/archive/munin/pg_newsblur_locks similarity index 100% rename from config/munin/pg_newsblur_locks rename to archive/munin/pg_newsblur_locks diff --git a/config/munin/pg_newsblur_stat_bgwriter b/archive/munin/pg_newsblur_stat_bgwriter similarity index 100% rename from config/munin/pg_newsblur_stat_bgwriter rename to archive/munin/pg_newsblur_stat_bgwriter diff --git a/config/munin/pg_newsblur_stat_database b/archive/munin/pg_newsblur_stat_database similarity index 100% rename from config/munin/pg_newsblur_stat_database rename to archive/munin/pg_newsblur_stat_database diff --git a/config/munin/pg_newsblur_stat_tables b/archive/munin/pg_newsblur_stat_tables similarity index 100% rename from config/munin/pg_newsblur_stat_tables rename to archive/munin/pg_newsblur_stat_tables diff --git a/config/munin/pg_newsblur_statio_tables b/archive/munin/pg_newsblur_statio_tables similarity index 100% rename from config/munin/pg_newsblur_statio_tables rename to archive/munin/pg_newsblur_statio_tables diff --git a/config/munin/pgbouncer_pools_cl_ b/archive/munin/pgbouncer_pools_cl_ similarity index 100% rename from config/munin/pgbouncer_pools_cl_ rename to archive/munin/pgbouncer_pools_cl_ diff --git a/config/munin/pgbouncer_pools_sv_ b/archive/munin/pgbouncer_pools_sv_ similarity index 100% rename from config/munin/pgbouncer_pools_sv_ rename to archive/munin/pgbouncer_pools_sv_ diff --git a/config/munin/pgbouncer_stats_avg_bytes_ b/archive/munin/pgbouncer_stats_avg_bytes_ similarity index 100% rename from config/munin/pgbouncer_stats_avg_bytes_ rename to archive/munin/pgbouncer_stats_avg_bytes_ diff --git a/config/munin/pgbouncer_stats_avg_query_ b/archive/munin/pgbouncer_stats_avg_query_ similarity index 100% rename from config/munin/pgbouncer_stats_avg_query_ rename to archive/munin/pgbouncer_stats_avg_query_ diff --git a/config/munin/pgbouncer_stats_avg_req_ b/archive/munin/pgbouncer_stats_avg_req_ similarity index 100% rename from config/munin/pgbouncer_stats_avg_req_ rename to archive/munin/pgbouncer_stats_avg_req_ diff --git a/config/munin/postgres_block_read_ b/archive/munin/postgres_block_read_ similarity index 100% rename from config/munin/postgres_block_read_ rename to archive/munin/postgres_block_read_ diff --git a/config/munin/postgres_commits_ b/archive/munin/postgres_commits_ similarity index 100% rename from config/munin/postgres_commits_ rename to archive/munin/postgres_commits_ diff --git a/config/munin/postgres_connections b/archive/munin/postgres_connections similarity index 100% rename from config/munin/postgres_connections rename to archive/munin/postgres_connections diff --git a/config/munin/postgres_locks b/archive/munin/postgres_locks similarity index 100% rename from config/munin/postgres_locks rename to archive/munin/postgres_locks diff --git a/config/munin/postgres_queries_ b/archive/munin/postgres_queries_ similarity index 100% rename from config/munin/postgres_queries_ rename to archive/munin/postgres_queries_ diff --git a/config/munin/postgres_space_ b/archive/munin/postgres_space_ similarity index 100% rename from config/munin/postgres_space_ rename to archive/munin/postgres_space_ diff --git a/config/munin/postgres_table_sizes b/archive/munin/postgres_table_sizes similarity index 100% rename from config/munin/postgres_table_sizes rename to archive/munin/postgres_table_sizes diff --git a/config/munin/redis_active_connections b/archive/munin/redis_active_connections similarity index 100% rename from config/munin/redis_active_connections rename to archive/munin/redis_active_connections diff --git a/config/munin/redis_commands b/archive/munin/redis_commands similarity index 100% rename from config/munin/redis_commands rename to archive/munin/redis_commands diff --git a/config/munin/redis_connects b/archive/munin/redis_connects similarity index 100% rename from config/munin/redis_connects rename to archive/munin/redis_connects diff --git a/config/munin/redis_sessions_active_connections b/archive/munin/redis_sessions_active_connections similarity index 100% rename from config/munin/redis_sessions_active_connections rename to archive/munin/redis_sessions_active_connections diff --git a/config/munin/redis_sessions_connects b/archive/munin/redis_sessions_connects similarity index 100% rename from config/munin/redis_sessions_connects rename to archive/munin/redis_sessions_connects diff --git a/config/munin/redis_sessions_size b/archive/munin/redis_sessions_size similarity index 100% rename from config/munin/redis_sessions_size rename to archive/munin/redis_sessions_size diff --git a/config/munin/redis_sessions_used_memory b/archive/munin/redis_sessions_used_memory similarity index 100% rename from config/munin/redis_sessions_used_memory rename to archive/munin/redis_sessions_used_memory diff --git a/config/munin/redis_sesssions_commands b/archive/munin/redis_sesssions_commands similarity index 100% rename from config/munin/redis_sesssions_commands rename to archive/munin/redis_sesssions_commands diff --git a/config/munin/redis_size b/archive/munin/redis_size similarity index 100% rename from config/munin/redis_size rename to archive/munin/redis_size diff --git a/config/munin/redis_story_active_connections b/archive/munin/redis_story_active_connections similarity index 100% rename from config/munin/redis_story_active_connections rename to archive/munin/redis_story_active_connections diff --git a/config/munin/redis_story_commands b/archive/munin/redis_story_commands similarity index 100% rename from config/munin/redis_story_commands rename to archive/munin/redis_story_commands diff --git a/config/munin/redis_story_connects b/archive/munin/redis_story_connects similarity index 100% rename from config/munin/redis_story_connects rename to archive/munin/redis_story_connects diff --git a/config/munin/redis_story_size b/archive/munin/redis_story_size similarity index 100% rename from config/munin/redis_story_size rename to archive/munin/redis_story_size diff --git a/config/munin/redis_story_used_memory b/archive/munin/redis_story_used_memory similarity index 100% rename from config/munin/redis_story_used_memory rename to archive/munin/redis_story_used_memory diff --git a/config/munin/redis_used_memory b/archive/munin/redis_used_memory similarity index 100% rename from config/munin/redis_used_memory rename to archive/munin/redis_used_memory diff --git a/config/munin/request_time b/archive/munin/request_time similarity index 100% rename from config/munin/request_time rename to archive/munin/request_time diff --git a/config/munin/riak_ops b/archive/munin/riak_ops similarity index 100% rename from config/munin/riak_ops rename to archive/munin/riak_ops diff --git a/config/munin/tc_size b/archive/munin/tc_size similarity index 100% rename from config/munin/tc_size rename to archive/munin/tc_size diff --git a/terraform/digitalocean.tf b/terraform/digitalocean.tf index 5dba77273..add169113 100644 --- a/terraform/digitalocean.tf +++ b/terraform/digitalocean.tf @@ -419,7 +419,7 @@ resource "digitalocean_droplet" "db-postgres" { # servers=$(for i in {1..9}; do echo -n "-target=\"digitalocean_droplet.db-mongo-primary[$i]\" " ; done); tf plan -refresh=false `eval echo $servers` # resource "digitalocean_droplet" "db-mongo-primary" { - count = 1 + count = 8 backups = true image = var.droplet_os name = "db-mongo-primary${count.index+2}" @@ -467,18 +467,18 @@ resource "digitalocean_droplet" "db-mongo-secondary" { } resource "digitalocean_volume" "mongo_analytics_volume" { - count = 2 + count = 1 region = "nyc1" - name = "mongoanalytics${count.index==0 ? "" : count.index+1}" + name = "mongoanalytics${count.index+2}" size = 100 initial_filesystem_type = "xfs" description = "Storage for NewsBlur MongoDB Analytics" } resource "digitalocean_droplet" "db-mongo-analytics" { - count = 2 + count = 1 image = var.droplet_os - name = "db-mongo-analytics${count.index==0 ? "" : count.index+1}" + name = "db-mongo-analytics${count.index+2}" region = var.droplet_region size = var.mongo_analytics_droplet_size volume_ids = [element(digitalocean_volume.mongo_analytics_volume.*.id, count.index)]