Merge branch 'release/1.11.0'

ansible.cfg

@@ -0,0 +1,2 @@
+[defaults]
+callback_whitelist = profile_tasks

deployment/RELEASES.md

@@ -78,7 +78,7 @@ $ ./mmw_stack.py launch-stacks --aws-profile mmw-prd \
                                --activate-dns
 ```
 
-Within 60 seconds, `mmw.azavea.com` should reflect the current release.
+Within 60 seconds, `app.wikiwatershed.org` and `mmw.azavea.com` should reflect the current release.
 
 ## Repository & Jenkins Cleanup
 

deployment/ansible/app-servers.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: app-servers
-  sudo: True
+  become: True
 
   pre_tasks:
     - name: Update APT cache

deployment/ansible/group_vars/all

@@ -32,6 +32,10 @@ nodejs_npm_version: 2.1.17
 
 java_version: "7u95-*"
 
+graphite_carbon_version: "0.9.13-pre1"
+graphite_whisper_version: "0.9.13-pre1"
+graphite_web_version: "0.9.13-pre1"
+
 docker_version: "1.9.*"
 docker_py_version: "1.2.3"
 docker_options: "--storage-driver=aufs"

deployment/ansible/group_vars/packer

@@ -1,6 +1,9 @@
 ---
 django_settings_module: "mmw.settings.production"
 
+itsi_base_url: ""
+itsi_secret_key: ""
+
 postgresql_username: "modelmywatershed"
 postgresql_database: "modelmywatershed"
 
@@ -16,6 +19,7 @@ relp_host: "monitoring.service.mmw.internal"
 graphite_host: "monitoring.service.mmw.internal"
 statsite_host: "monitoring.service.mmw.internal"
 
+tiler_host: ""
 tilecache_bucket_name: ""
 
 stack_type: "Packer"

deployment/ansible/inventory/packer-app-server

@@ -1,5 +1,5 @@
 [mmw-app]
-localhost ansible_ssh_user=ubuntu
+localhost ansible_user=ubuntu
 
 [app-servers]
 mmw-app

deployment/ansible/inventory/packer-monitoring-server

@@ -1,5 +1,5 @@
 [mmw-monitoring]
-localhost ansible_ssh_user=ubuntu
+localhost ansible_user=ubuntu
 
 [monitoring-servers]
 mmw-monitoring

deployment/ansible/inventory/packer-tile-server

@@ -1,5 +1,5 @@
 [mmw-tiler]
-localhost ansible_ssh_user=ubuntu
+localhost ansible_user=ubuntu
 
 [tile-servers]
 mmw-tiler

deployment/ansible/inventory/packer-worker-server

@@ -1,5 +1,5 @@
 [mmw-worker]
-localhost ansible_ssh_user=ubuntu
+localhost ansible_user=ubuntu
 
 [workers]
 mmw-worker

deployment/ansible/monitoring-servers.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: monitoring-servers
-  sudo: True
+  become: True
 
   pre_tasks:
     - name: Update APT cache

deployment/ansible/roles.yml

@@ -0,0 +1,50 @@
+- src: azavea.ntp
+  version: 0.1.1
+- src: azavea.pip
+  version: 0.1.1
+- src: azavea.nodejs
+  version: 0.3.0
+- src: azavea.git
+  version: 0.1.0
+- src: azavea.nginx
+  version: 0.2.1
+- src: azavea.daemontools
+  version: 0.1.0
+- src: azavea.postgresql-support
+  version: 0.3.0
+- src: azavea.postgresql
+  version: 0.3.0
+- src: azavea.postgis
+  version: 0.3.0
+- src: azavea.pgweb
+  version: 0.2.0
+- src: azavea.redis
+  version: 0.1.0
+- src: azavea.graphite
+  version: 0.6.1
+- src: azavea.statsite
+  version: 1.1.0
+- src: azavea.phantomjs
+  version: 0.1.0
+- src: azavea.relp
+  version: 0.1.2
+- src: azavea.curator
+  version: 0.1.0
+- src: azavea.elasticsearch
+  version: 0.2.0
+- src: azavea.logstash
+  version: 0.1.0
+- src: azavea.kibana
+  version: 0.3.1
+- src: azavea.collectd
+  version: 0.2.0
+- src: azavea.build-essential
+  version: 0.1.0
+- src: azavea.mapnik
+  version: 0.1.0
+- src: azavea.beaver
+  version: 0.1.3
+- src: azavea.java
+  version: 0.2.1
+- src: azavea.docker
+  version: 1.0.2

deployment/ansible/roles/model-my-watershed.app/tasks/app.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure that source directories exist
   file: path="{{ item }}"
-        owner="{{ ansible_ssh_user }}"
+        owner="{{ ansible_user }}"
         group=mmw
         mode=0755
         state=directory
@@ -13,7 +13,7 @@
   git: repo=https://github.com/WikiWatershed/model-my-watershed.git
        dest=/opt/model-my-watershed
        version="{{ app_deploy_branch }}"
-  sudo: False
+  become: False
 
 - name: Synchronize Django application into app_home
   synchronize: archive=no
@@ -23,4 +23,4 @@
                set_remote_user=no
                src=/opt/model-my-watershed/src/mmw/
                dest="{{ app_home }}/"
-  sudo: False
+  become: False

deployment/ansible/roles/model-my-watershed.app/tasks/dev-and-test-dependencies.yml

@@ -1,6 +1,6 @@
 ---
 - name: Install Firefox for UI tests
-  apt: pkg=firefox="4*" state=present
+  apt: pkg="firefox=4*" state=present
 
 - name: Install Xvfb for JavaScript tests
-  apt: pkg=xvfb="2:1.15.1*" state=present
+  apt: pkg="xvfb=2:1.15.1*" state=present

deployment/ansible/roles/model-my-watershed.app/tasks/log-rotation.yml

@@ -1,7 +1,6 @@
 ---
 - name: Touch application log file if it does not exist
-  command: touch {{ app_log }}
-           creates={{ app_log }}
+  copy: content="" dest="{{ app_log }}" force=no
 
 - name: Set application log file permissions
   file: path={{ app_log }}
@@ -14,8 +13,7 @@
             dest=/etc/logrotate.d/mmw-app
 
 - name: Touch Gunicorn log file if it does not exist
-  command: touch {{ app_gunicorn_log }}
-           creates={{ app_gunicorn_log }}
+  copy: content="" dest="{{ app_gunicorn_log }}" force=no
 
 - name: Set Gunicorn log file permissions
   file: path={{ app_gunicorn_log }}
@@ -26,4 +24,3 @@
 - name: Configure Gunicorn log rotation
   template: src=logrotate-gunicorn.j2
             dest=/etc/logrotate.d/mmw-gunicorn
-

deployment/ansible/roles/model-my-watershed.app/tasks/static-files.yml

@@ -2,7 +2,7 @@
 - name: Create folders for static files
   file: path="{{ item }}"
         state=directory
-        owner="{{ ansible_ssh_user }}"
+        owner="{{ ansible_user }}"
         group=mmw
         mode=0775
   with_items:
@@ -14,38 +14,38 @@
   command: "npm install --unsafe-perm"
   args:
     chdir: "{{ app_home }}"
-  sudo: False
+  become: False
 
 - name: Check for lint
   command: "npm run lint"
   args:
     chdir: "{{ app_home }}"
-  sudo: False
+  become: False
   ignore_errors: True
 
 - name: Create JS bundles (staging/production)
   command: "./bundle.sh --vendor --tests"
   args:
     chdir: "{{ app_home }}"
-  environment: app_config
-  sudo: False
+  environment: "{{ app_config }}"
+  become: False
   when: "['development'] | is_not_in(group_names)"
 
 - name: Create JS bundles (development)
   command: "./bundle.sh --vendor --tests --debug"
   args:
     chdir: "{{ app_home }}"
-  environment: app_config
-  sudo: False
+  environment: "{{ app_config }}"
+  become: False
   when: "['development'] | is_in(group_names)"
 
 - name: Run Django collectstatic command
   django_manage: command=collectstatic app_path="{{ app_home }}"
   environment: "{{ envdir_config | combine(app_config) }}"
-  sudo: False
+  become: False
 
 - name: Create JavaScript test harness
   template: src=testem-harness.html.j2
             dest="{{ app_static_root }}/test.html"
-  sudo: False
+  become: False
   when: "['development', 'test'] | some_are_in(group_names)"

deployment/ansible/roles/model-my-watershed.base/tasks/configuration.yml

@@ -7,7 +7,7 @@
         state=present
 
 - name: Add Ansible SSH user to the mmw group
-  user: name="{{ ansible_ssh_user }}"
+  user: name="{{ ansible_user }}"
         append=yes
         group=mmw
         state=present

deployment/ansible/roles/model-my-watershed.beaver/templates/spark-jobserver.conf.j2

@@ -1,3 +1,4 @@
 [/var/log/upstart/spark-jobserver.log]
+multiline_regex_before = ^\s+
 type: spark-jobserver
 tags: spark-jobserver,beaver

deployment/ansible/roles/model-my-watershed.celery-worker/tasks/app.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure that source directories exist
   file: path="{{ item }}"
-        owner="{{ ansible_ssh_user }}"
+        owner="{{ ansible_user }}"
         group=mmw
         mode=0755
         state=directory
@@ -13,7 +13,7 @@
   git: repo=https://github.com/WikiWatershed/model-my-watershed.git
        dest=/opt/model-my-watershed
        version="{{ app_deploy_branch }}"
-  sudo: False
+  become: False
 
 - name: Synchronize Django application into app_home
   synchronize: archive=no
@@ -23,4 +23,4 @@
                set_remote_user=no
                src=/opt/model-my-watershed/src/mmw/
                dest="{{ app_home }}/"
-  sudo: False
+  become: False

deployment/ansible/roles/model-my-watershed.logstash/templates/logstash.conf.j2

@@ -21,16 +21,6 @@ filter {
       match => [ "timestamp", "E, dd MMM yyyy HH:mm:ss z" ]
     }
   }
-
-  if [type] == "spark-jobserver" {
-    grok {
-      match => { "message" => "%{TIMESTAMP_ISO8601:timestamp}" }
-    }
-
-    date {
-      match => [ "timestamp", "yyyy-MM-dd HH:mm:ss,SSS" ]
-    }
-  }
 }
 
 output {