Merge branch 'edge'

conf/newrelic.ini

@@ -0,0 +1,206 @@
+# ---------------------------------------------------------------------------
+
+#
+# This file configures the New Relic Python Agent.
+#
+# The path to the configuration file should be supplied to the function
+# newrelic.agent.initialize() when the agent is being initialized.
+#
+# The configuration file follows a structure similar to what you would
+# find for Microsoft Windows INI files. For further information on the
+# configuration file format see the Python ConfigParser documentation at:
+#
+#    http://docs.python.org/library/configparser.html
+#
+# For further discussion on the behaviour of the Python agent that can
+# be configured via this configuration file see:
+#
+#    http://newrelic.com/docs/python/python-agent-configuration
+#
+
+# ---------------------------------------------------------------------------
+
+# Here are the settings that are common to all environments.
+
+[newrelic]
+
+# You must specify the license key associated with your New
+# Relic account. This key binds the Python Agent's data to your
+# account in the New Relic service.
+# license_key = {{ new_relic_licence_key }}
+
+# The application name. Set this to be the name of your
+# application as you would like it to show up in New Relic UI.
+# The UI will then auto-map instances of your application into a
+# entry on your home dashboard page.
+app_name = Designsafe
+
+# When "true", the agent collects performance data about your
+# application and reports this data to the New Relic UI at
+# newrelic.com. This global switch is normally overridden for
+# each environment below.
+monitor_mode = true
+
+# Sets the name of a file to log agent messages to. Useful for
+# debugging any issues with the agent. This is not set by
+# default as it is not known in advance what user your web
+# application processes will run as and where they have
+# permission to write to. Whatever you set this to you must
+# ensure that the permissions for the containing directory and
+# the file itself are correct, and that the user that your web
+# application runs as can write to the file. If not able to
+# write out a log file, it is also possible to say "stderr" and
+# output to standard error output. This would normally result in
+# output appearing in your web server log.
+#log_file = /tmp/newrelic-python-agent.log
+
+# Sets the level of detail of messages sent to the log file, if
+# a log file location has been provided. Possible values, in
+# increasing order of detail, are: "critical", "error", "warning",
+# "info" and "debug". When reporting any agent issues to New
+# Relic technical support, the most useful setting for the
+# support engineers is "debug". However, this can generate a lot
+# of information very quickly, so it is best not to keep the
+# agent at this level for longer than it takes to reproduce the
+# problem you are experiencing.
+log_level = info
+
+# The Python Agent communicates with the New Relic service using
+# SSL by default. Note that this does result in an increase in
+# CPU overhead, over and above what would occur for a non SSL
+# connection, to perform the encryption involved in the SSL
+# communication. This work is though done in a distinct thread
+# to those handling your web requests, so it should not impact
+# response times. You can if you wish revert to using a non SSL
+# connection, but this will result in information being sent
+# over a plain socket connection and will not be as secure.
+ssl = true
+
+# High Security Mode enforces certain security settings, and
+# prevents them from being overridden, so that no sensitive data
+# is sent to New Relic. Enabling High Security Mode means that
+# SSL is turned on, request parameters are not collected, and SQL
+# can not be sent to New Relic in its raw form. To activate High
+# Security Mode, it must be set to 'true' in this local .ini
+# configuration file AND be set to 'true' in the server-side
+# configuration in the New Relic user interface. For details, see
+# https://docs.newrelic.com/docs/subscriptions/high-security
+high_security = false
+
+# The Python Agent will attempt to connect directly to the New
+# Relic service. If there is an intermediate firewall between
+# your host and the New Relic service that requires you to use a
+# HTTP proxy, then you should set both the "proxy_host" and
+# "proxy_port" settings to the required values for the HTTP
+# proxy. The "proxy_user" and "proxy_pass" settings should
+# additionally be set if proxy authentication is implemented by
+# the HTTP proxy. The "proxy_scheme" setting dictates what
+# protocol scheme is used in talking to the HTTP proxy. This
+# would normally always be set as "http" which will result in the
+# agent then using a SSL tunnel through the HTTP proxy for end to
+# end encryption.
+# proxy_scheme = http
+# proxy_host = hostname
+# proxy_port = 8080
+# proxy_user =
+# proxy_pass =
+
+# Capturing request parameters is off by default. To enable the
+# capturing of request parameters, first ensure that the setting
+# "attributes.enabled" is set to "true" (the default value), and
+# then add "request.parameters.*" to the "attributes.include"
+# setting. For details about attributes configuration, please
+# consult the documentation.
+# attributes.include = request.parameters.*
+
+# The transaction tracer captures deep information about slow
+# transactions and sends this to the UI on a periodic basis. The
+# transaction tracer is enabled by default. Set this to "false"
+# to turn it off.
+transaction_tracer.enabled = true
+
+# Threshold in seconds for when to collect a transaction trace.
+# When the response time of a controller action exceeds this
+# threshold, a transaction trace will be recorded and sent to
+# the UI. Valid values are any positive float value, or (default)
+# "apdex_f", which will use the threshold for a dissatisfying
+# Apdex controller action - four times the Apdex T value.
+transaction_tracer.transaction_threshold = apdex_f
+
+# When the transaction tracer is on, SQL statements can
+# optionally be recorded. The recorder has three modes, "off"
+# which sends no SQL, "raw" which sends the SQL statement in its
+# original form, and "obfuscated", which strips out numeric and
+# string literals.
+transaction_tracer.record_sql = obfuscated
+
+# Threshold in seconds for when to collect stack trace for a SQL
+# call. In other words, when SQL statements exceed this
+# threshold, then capture and send to the UI the current stack
+# trace. This is helpful for pinpointing where long SQL calls
+# originate from in an application.
+transaction_tracer.stack_trace_threshold = 0.5
+
+# Determines whether the agent will capture query plans for slow
+# SQL queries. Only supported in MySQL and PostgreSQL. Set this
+# to "false" to turn it off.
+transaction_tracer.explain_enabled = true
+
+# Threshold for query execution time below which query plans
+# will not not be captured. Relevant only when "explain_enabled"
+# is true.
+transaction_tracer.explain_threshold = 0.5
+
+# Space separated list of function or method names in form
+# 'module:function' or 'module:class.function' for which
+# additional function timing instrumentation will be added.
+transaction_tracer.function_trace =
+
+# The error collector captures information about uncaught
+# exceptions or logged exceptions and sends them to UI for
+# viewing. The error collector is enabled by default. Set this
+# to "false" to turn it off.
+error_collector.enabled = true
+
+# To stop specific errors from reporting to the UI, set this to
+# a space separated list of the Python exception type names to
+# ignore. The exception name should be of the form 'module:class'.
+error_collector.ignore_errors =
+
+# Browser monitoring is the Real User Monitoring feature of the UI.
+# For those Python web frameworks that are supported, this
+# setting enables the auto-insertion of the browser monitoring
+# JavaScript fragments.
+browser_monitoring.auto_instrument = true
+
+# A thread profiling session can be scheduled via the UI when
+# this option is enabled. The thread profiler will periodically
+# capture a snapshot of the call stack for each active thread in
+# the application to construct a statistically representative
+# call tree.
+thread_profiler.enabled = true
+
+# ---------------------------------------------------------------------------
+
+#
+# The application environments. These are specific settings which
+# override the common environment settings. The settings related to a
+# specific environment will be used when the environment argument to the
+# newrelic.agent.initialize() function has been defined to be either
+# "development", "test", "staging" or "production".
+#
+
+[newrelic:development]
+monitor_mode = false
+
+[newrelic:test]
+monitor_mode = false
+
+[newrelic:staging]
+app_name = DesignSafe (Staging)
+monitor_mode = true
+
+[newrelic:production]
+monitor_mode = true
+
+# ---------------------------------------------------------------------------

conf/uwsgi.ini

@@ -10,11 +10,14 @@ module=designsafe.wsgi:application
 master = True
 pidfile = /tmp/django-master.pid
 vacuum = True
-processes = 10
+processes = 20
 buffer-size = 65535
 harakiri = 120
-post-buffering = 4096
+#post-buffering = 4096
 max-requests = 500
 uid = tg458981
 socket = 0.0.0.0:8000
+enable-threads = true
+single-interpreter = true
+memory-report
 lazy-apps

designsafe.env.sample

@@ -124,15 +124,19 @@ FLOWER_BROKER_API=
 #CELERY config
 
 BROKER_URL_PROTOCOL=amqp://
-BROKER_URL_USERNAME= 
-BROKER_URL_PWD= 
-BROKER_URL_HOST= 
-BROKER_URL_PORT= 
-BROKER_URL_VHOST= 
+BROKER_URL_USERNAME=
+BROKER_URL_PWD=
+BROKER_URL_HOST=
+BROKER_URL_PORT=
+BROKER_URL_VHOST=
 #BROKER_URL = 'amqp://designsafe:pwd@rabbitmq:5672//'
-CELERY_RESULT_BACKEND_PROTOCOL= 
-CELERY_RESULT_BACKEND_USERNAME= 
-CELERY_RESULT_BACKEND_PWD= 
-CELERY_RESULT_BACKEND_HOST= 
-CELERY_RESULT_BACKEND_PORT= 
-CELERY_RESULT_BACKEND_DB= 
+CELERY_RESULT_BACKEND_PROTOCOL=
+CELERY_RESULT_BACKEND_USERNAME=
+CELERY_RESULT_BACKEND_PWD=
+CELERY_RESULT_BACKEND_HOST=
+CELERY_RESULT_BACKEND_PORT=
+CELERY_RESULT_BACKEND_DB=
+
+NEW_RELIC_LICENSE_KEY=
+NEW_RELIC_CONFIG_FILE=
+NEW_RELIC_ENVIRONMENT=

designsafe/apps/accounts/forms.py

@@ -4,6 +4,8 @@
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
+from nocaptcha_recaptcha.fields import NoReCaptchaField
+
 from .models import (DesignSafeProfile, NotificationPreferences,
     DesignSafeProfileNHInterests, DesignSafeProfileResearchActivities)
 from termsandconditions.models import TermsAndConditions, UserTermsAndConditions
@@ -336,6 +338,8 @@ class UserRegistrationForm(forms.Form):
         label='I Agree to the <a href="/terms/" target="_blank">Terms of Use</a>',
         error_messages={'required': 'Please Accept the DesignSafe Terms of Use.'})
 
+    captcha = NoReCaptchaField()
+
     def __init__(self, *args, **kwargs):
         super(UserRegistrationForm, self).__init__(*args, **kwargs)
         self.fields['institutionId'].choices = get_institution_choices()
@@ -421,7 +425,7 @@ class ProfessionalProfileForm(forms.ModelForm):
     bio_placeholder = (
         'Please provide a brief summary of your professional profile, '
         'the natural hazards activities with which you are involved or '
-        'would like to be involved, and any other comments that would help ' 
+        'would like to be involved, and any other comments that would help '
         'identify your experience and interest within the community. '
     )
     nh_interests = forms.ModelMultipleChoiceField(

designsafe/apps/api/agave/__init__.py

@@ -3,9 +3,10 @@
     ..todo:: These should not live in __init__.py
     we should create an agave.utils or agave.libs module for these to live in."""
 
-from agavepy.agave import Agave
+from agavepy.agave import Agave, load_resource
 from django.conf import settings
 
+AGAVE_RESOURCES = load_resource(getattr(settings, 'AGAVE_TENANT_BASEURL'))
 
 def get_service_account_client():
     """Return service account agave client.
@@ -19,7 +20,8 @@ def get_service_account_client():
              but it might be a bit safer."""
 
     return Agave(api_server=settings.AGAVE_TENANT_BASEURL,
-                 token=settings.AGAVE_SUPER_TOKEN)
+                 token=settings.AGAVE_SUPER_TOKEN,
+                 resources=AGAVE_RESOURCES)
 
 
 def to_camel_case(snake_str):

designsafe/apps/api/data/agave/filemanager.py

@@ -1,4 +1,4 @@
-from agavepy.agave import Agave
+from agavepy.agave import Agave, load_resource
 from designsafe.apps.api.exceptions import ApiException
 from designsafe.apps.api.data.agave.file import AgaveFile
 from designsafe.apps.api.tasks import reindex_agave, share_agave
@@ -25,6 +25,7 @@
     'default': getattr(settings, 'AGAVE_STORAGE_SYSTEM')
 }
 
+AGAVE_RESOURCES = load_resource(getattr(settings, 'AGAVE_TENANT_BASEURL'))
 
 class FileManager(AbstractFileManager, AgaveObject):
     resource = 'agave'
@@ -885,7 +886,8 @@ class AgaveIndexer(AgaveObject):
     def __init__(self, agave_client = None, *args, **kwargs):
         super(AgaveIndexer, self).__init__(**kwargs)
         self.agave_client = Agave(api_server=settings.AGAVE_TENANT_BASEURL,
-                                  token=settings.AGAVE_SUPER_TOKEN)
+                                  token=settings.AGAVE_SUPER_TOKEN,
+                                  resources=AGAVE_RESOURCES)
 
         # user_model = get_user_model()
         # try: