Merge branch 'release/1.23.0'

Vagrantfile

@@ -74,7 +74,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     }.merge(VAGRANT_NETWORK_OPTIONS)
 
     services.vm.provider "virtualbox" do |v|
-      v.memory = 1024
+      v.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000 ]
+      v.memory = 2048
     end
 
     services.vm.provision "ansible" do |ansible|
@@ -108,7 +109,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     }.merge(VAGRANT_NETWORK_OPTIONS)
 
     worker.vm.provider "virtualbox" do |v|
+      v.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000 ]
       v.memory = 2048
+      v.cpus = 2
     end
 
     worker.vm.provision "ansible" do |ansible|
@@ -150,7 +153,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     app.ssh.forward_x11 = true
 
     app.vm.provider "virtualbox" do |v|
-      v.memory = 1024
+      v.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000 ]
+      v.memory = 2048
     end
 
     app.vm.provision "ansible" do |ansible|

deployment/ansible/group_vars/all

@@ -25,7 +25,7 @@ postgresql_database: mmw
 postgresql_version: "9.4"
 postgresql_package_version: "9.4.*.pgdg14.04+1"
 postgresql_support_repository_channel: "main"
-postgresql_support_libpq_version: "10.3-*.pgdg14.04+1"
+postgresql_support_libpq_version: "10.4-*.pgdg14.04+1"
 postgresql_support_psycopg2_version: "2.7"
 postgis_version: "2.1"
 postgis_package_version: "2.1.*.pgdg14.04+1"
@@ -36,8 +36,8 @@ nodejs_npm_version: 2.1.17
 
 apache_version: "2.4.7-*"
 
-java_version: "7u151-*"
-java_major_version: "7"
+java_version: "8u*"
+java_major_version: "8"
 java_flavor: "openjdk"
 
 graphite_carbon_version: "0.9.13-pre1"
@@ -51,7 +51,7 @@ docker_options: "--storage-driver=aufs"
 geop_host: "localhost"
 geop_port: 8090
 
-geop_version: "3.1.0"
+geop_version: "4.0.1"
 geop_cache_enabled: 1
 
 nginx_cache_dir: "/var/cache/nginx"

deployment/ansible/roles.yml

@@ -45,6 +45,6 @@
 - src: azavea.beaver
   version: 1.0.1
 - src: azavea.java
-  version: 0.6.1
+  version: 0.6.2
 - src: azavea.docker
-  version: 1.0.2
+  version: 2.0.0

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

@@ -4,7 +4,7 @@
         dest="{{ envdir_home }}/{{ item.key }}"
         owner=root
         group=mmw
-        mode=0750
+        mode=0440
   with_dict: "{{ app_config }}"
   notify:
     - Restart mmw-app

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=5*" state=present
+  apt: pkg="firefox=6*" state=present
 
 - name: Install Xvfb for JavaScript tests
   apt: pkg="xvfb=2:1.15.1*" state=present

deployment/ansible/roles/model-my-watershed.app/templates/gunicorn.py.j2

@@ -2,19 +2,18 @@ import multiprocessing
 
 bind = "127.0.0.1:8000"
 workers = (2 * multiprocessing.cpu_count()) + 1
+timeout = 60
 
 {% if ['development', 'test'] | some_are_in(group_names) -%}
 accesslog = "-"
 errorlog = "-"
 loglevel = 'debug'
 preload_app = False
 reload = True
-timeout = 1800
 {% else %}
 accesslog = None
 errorlog = "{{ app_gunicorn_log }}"
 loglevel = 'info'
 preload_app = True
 reload = False
-timeout = 60
 {% endif %}

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

@@ -16,15 +16,15 @@
   file: path="{{ envdir_home }}"
         owner=root
         group=mmw
-        mode=0750
+        mode=0550
         state=directory
 
 - name: Configure base settings
   copy: content="{{ item.value }}"
         dest="{{ envdir_home }}/{{ item.key }}"
         owner=root
         group=mmw
-        mode=0750
+        mode=0440
   with_dict: "{{ envdir_config }}"
   notify:
     - Restart mmw-app

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

@@ -4,7 +4,7 @@
         dest="{{ envdir_home }}/{{ item.key }}"
         owner=root
         group=mmw
-        mode=0750
+        mode=0440
   with_dict: "{{ app_config }}"
   notify:
     - Restart Celery

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

@@ -2,4 +2,5 @@
 - name: Install Celery
   pip: name="{{ item.name }}" version={{ item.version }} state=present
   with_items:
+    - { name: "kombu", version: "4.1.0" }
     - { name: "celery[redis]", version: "{{ celery_version }}" }

deployment/ansible/roles/model-my-watershed.geoprocessing/meta/main.yml

@@ -1,9 +1,5 @@
 ---
 dependencies:
-  - {
-      role: "azavea.java",
-      java_major_version: "8",
-      java_version: "8u141*"
-    }
+  - { role: "azavea.java" }
   - { role: "model-my-watershed.base" }
   - { role: "model-my-watershed.nginx" }

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

@@ -4,7 +4,7 @@
         dest="{{ envdir_home }}/{{ item.key }}"
         owner=root
         group=mmw
-        mode=0750
+        mode=0440
   with_dict: "{{ app_config }}"
   notify:
     - Restart Celery

deployment/cfn/application.py

@@ -7,7 +7,6 @@
     Base64,
     Join,
     Equals,
-    cloudwatch as cw,
     ec2,
     elasticloadbalancing as elb,
     autoscaling as asg
@@ -83,7 +82,7 @@ class Application(StackNode):
         'StackType': 'Staging',
         'StackColor': 'Green',
         'KeyName': 'mmw-stg',
-        'AppServerInstanceType': 't2.micro',
+        'AppServerInstanceType': 't2.small',
         'AppServerInstanceProfile': 'AppServerInstanceProfile',
         'AppServerAutoScalingDesired': '1',
         'AppServerAutoScalingMin': '1',
@@ -128,7 +127,7 @@ def set_up_stack(self):
         ), 'RDSPassword')
 
         self.app_server_instance_type = self.add_parameter(Parameter(
-            'AppServerInstanceType', Type='String', Default='t2.micro',
+            'AppServerInstanceType', Type='String', Default='t2.small',
             Description='Application server EC2 instance type',
             AllowedValues=EC2_INSTANCE_TYPES,
             ConstraintDescription='must be a valid EC2 instance type.'
@@ -280,8 +279,6 @@ def set_up_stack(self):
                                            app_server_lb,
                                            backward_compat_app_server_lb)
 
-        self.create_cloud_watch_resources(app_server_lb)
-
         self.add_output(Output('AppServerLoadBalancerEndpoint',
                                Value=GetAtt(app_server_lb, 'DNSName')))
         self.add_output(Output('AppServerLoadBalancerHostedZoneNameID',
@@ -634,47 +631,6 @@ def get_cloud_config(self, tile_distribution_endpoint):
                 '    owner: root:mmw\n',
                 '    content: ', Ref(self.client_app_user_password)]
 
-    def create_cloud_watch_resources(self, app_server_lb):
-        self.add_resource(cw.Alarm(
-            'alarmAppServerBackend4XX',
-            AlarmDescription='Application server backend 4XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Sum',
-            Period=300,
-            Threshold='20',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='HTTPCode_Backend_4XX',
-            Namespace='AWS/ELB',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricLoadBalancerName',
-                    Name='LoadBalancerName',
-                    Value=Ref(app_server_lb)
-                )
-            ],
-        ))
-
-        self.add_resource(cw.Alarm(
-            'alarmAppServerBackend5XX',
-            AlarmDescription='Application server backend 5XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Sum',
-            Period=60,
-            Threshold='0',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='HTTPCode_Backend_5XX',
-            Namespace='AWS/ELB',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricLoadBalancerName',
-                    Name='LoadBalancerName',
-                    Value=Ref(app_server_lb)
-                )
-            ],
-        ))
-
     def get_tags(self, **kwargs):
         """Helper method to return Troposphere tags + default tags
 

deployment/cfn/tile_delivery_network.py

@@ -6,7 +6,6 @@
     GetAtt,
     Join,
     cloudfront as cf,
-    cloudwatch as cw,
     route53 as r53,
     s3
 )
@@ -107,56 +106,6 @@ def create_cloudfront_distributions(self):
             )
         ))
 
-        self.add_resource(cw.Alarm(
-            'alarmTileDistributionBlueOrigin4XX',
-            AlarmDescription='Tile distribution origin 4XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Average',
-            Period=300,
-            Threshold='20',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='4xxErrorRate',
-            Namespace='AWS/CloudFront',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricDistributionId',
-                    Name='DistributionId',
-                    Value=Ref(blue_tile_distribution)
-                ),
-                cw.MetricDimension(
-                    'metricRegion',
-                    Name='Region',
-                    Value='Global'
-                )
-            ]
-        ))
-
-        self.add_resource(cw.Alarm(
-            'alarmTileDistributionBlueOrigin5XX',
-            AlarmDescription='Tile distribution origin 5XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Average',
-            Period=60,
-            Threshold='0',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='5xxErrorRate',
-            Namespace='AWS/CloudFront',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricDistributionId',
-                    Name='DistributionId',
-                    Value=Ref(blue_tile_distribution)
-                ),
-                cw.MetricDimension(
-                    'metricRegion',
-                    Name='Region',
-                    Value='Global'
-                )
-            ]
-        ))
-
         green_tile_distribution = self.add_resource(cf.Distribution(
             'tileDistributionGreen',
             DistributionConfig=cf.DistributionConfig(
@@ -180,56 +129,6 @@ def create_cloudfront_distributions(self):
             )
         ))
 
-        self.add_resource(cw.Alarm(
-            'alarmTileDistributionGreenOrigin4XX',
-            AlarmDescription='Tile distribution origin 4XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Average',
-            Period=300,
-            Threshold='20',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='4xxErrorRate',
-            Namespace='AWS/CloudFront',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricDistributionId',
-                    Name='DistributionId',
-                    Value=Ref(green_tile_distribution)
-                ),
-                cw.MetricDimension(
-                    'metricRegion',
-                    Name='Region',
-                    Value='Global'
-                )
-            ]
-        ))
-
-        self.add_resource(cw.Alarm(
-            'alarmTileDistributionGreenOrigin5XX',
-            AlarmDescription='Tile distribution origin 5XXs',
-            AlarmActions=[Ref(self.notification_topic_arn)],
-            Statistic='Average',
-            Period=60,
-            Threshold='0',
-            EvaluationPeriods=1,
-            ComparisonOperator='GreaterThanThreshold',
-            MetricName='5xxErrorRate',
-            Namespace='AWS/CloudFront',
-            Dimensions=[
-                cw.MetricDimension(
-                    'metricDistributionId',
-                    Name='DistributionId',
-                    Value=Ref(green_tile_distribution)
-                ),
-                cw.MetricDimension(
-                    'metricRegion',
-                    Name='Region',
-                    Value='Global'
-                )
-            ]
-        ))
-
         return blue_tile_distribution, green_tile_distribution
 
     def create_s3_resources(self):