elasticsearch: support multiple ES nodes

backend/src/appenlight/__init__.py

@@ -1,285 +1,285 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # App Enlight Enterprise Edition, including its added features, Support
 # services, and proprietary license terms, please see
 # https://rhodecode.com/licenses/
 
 import datetime
 import logging
 import pyelasticsearch
 import redis
 import os
 from pkg_resources import iter_entry_points
 
 import appenlight.lib.jinja2_filters as jinja2_filters
 import appenlight.lib.encryption as encryption
 
 from authomatic.providers import oauth2, oauth1
 from authomatic import Authomatic
 from pyramid.config import Configurator, PHASE3_CONFIG
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid_mailer.mailer import Mailer
 from pyramid.renderers import JSON
 from pyramid_redis_sessions import session_factory_from_settings
 from pyramid.settings import asbool, aslist
 from pyramid.security import AllPermissionsList
 from pyramid_authstack import AuthenticationStackPolicy
 from redlock import Redlock
 from sqlalchemy import engine_from_config
 
 from appenlight.celery import configure_celery
 from appenlight.lib import cache_regions
 from appenlight.lib.ext_json import json
 from appenlight.security import groupfinder, AuthTokenAuthenticationPolicy
 
 json_renderer = JSON(serializer=json.dumps, indent=4)
 
 log = logging.getLogger(__name__)
 
 
 def datetime_adapter(obj, request):
     return obj.isoformat()
 
 
 def all_permissions_adapter(obj, request):
     return '__all_permissions__'
 
 
 json_renderer.add_adapter(datetime.datetime, datetime_adapter)
 json_renderer.add_adapter(AllPermissionsList, all_permissions_adapter)
 
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
     auth_tkt_policy = AuthTktAuthenticationPolicy(
         settings['authtkt.secret'],
         hashalg='sha512',
         callback=groupfinder,
         max_age=2592000,
         secure=asbool(settings.get('authtkt.secure', 'false')))
     auth_token_policy = AuthTokenAuthenticationPolicy(
         callback=groupfinder
     )
     authorization_policy = ACLAuthorizationPolicy()
     authentication_policy = AuthenticationStackPolicy()
     authentication_policy.add_policy('auth_tkt', auth_tkt_policy)
     authentication_policy.add_policy('auth_token', auth_token_policy)
     # set crypto key
     encryption.ENCRYPTION_SECRET = settings.get('encryption_secret')
     # import this later so encyption key can be monkeypatched
     from appenlight.models import DBSession, register_datastores
     # update config with cometd info
     settings['cometd_servers'] = {'server': settings['cometd.server'],
                                   'secret': settings['cometd.secret']}
 
     # Create the Pyramid Configurator.
     settings['_mail_url'] = settings['mailing.app_url']
     config = Configurator(settings=settings,
                           authentication_policy=authentication_policy,
                           authorization_policy=authorization_policy,
                           root_factory='appenlight.security.RootFactory',
                           default_permission='view')
     config.set_default_csrf_options(require_csrf=True, header='X-XSRF-TOKEN')
     config.add_view_deriver('appenlight.predicates.csrf_view',
                             name='csrf_view')
 
 
     # later, when config is available
     dogpile_config = {'url': settings['redis.url'],
                       "redis_expiration_time": 86400,
                       "redis_distributed_lock": True}
     cache_regions.regions = cache_regions.CacheRegions(dogpile_config)
     config.registry.cache_regions = cache_regions.regions
     engine = engine_from_config(settings, 'sqlalchemy.',
                                 json_serializer=json.dumps)
     DBSession.configure(bind=engine)
 
     # json rederer that serializes datetime
     config.add_renderer('json', json_renderer)
     config.set_request_property('appenlight.lib.request.es_conn', 'es_conn')
     config.set_request_property('appenlight.lib.request.get_user', 'user',
                                 reify=True)
     config.set_request_property('appenlight.lib.request.get_csrf_token',
                                 'csrf_token', reify=True)
     config.set_request_property('appenlight.lib.request.safe_json_body',
                                 'safe_json_body', reify=True)
     config.set_request_property('appenlight.lib.request.unsafe_json_body',
                                 'unsafe_json_body', reify=True)
     config.add_request_method('appenlight.lib.request.add_flash_to_headers',
                               'add_flash_to_headers')
 
     config.include('pyramid_redis_sessions')
     config.include('pyramid_tm')
     config.include('pyramid_jinja2')
     config.include('appenlight_client.ext.pyramid_tween')
     config.include('ziggurat_foundations.ext.pyramid.sign_in')
     config.registry.es_conn = pyelasticsearch.ElasticSearch(
-        settings['elasticsearch.nodes'])
+        aslist(settings['elasticsearch.nodes']))
     config.registry.redis_conn = redis.StrictRedis.from_url(
         settings['redis.url'])
 
     config.registry.redis_lockmgr = Redlock([settings['redis.redlock.url'], ],
                                             retry_count=0, retry_delay=0)
     # mailer
     config.registry.mailer = Mailer.from_settings(settings)
 
     # Configure sessions
     session_factory = session_factory_from_settings(settings)
     config.set_session_factory(session_factory)
 
     # Configure renderers and event subscribers
     config.add_jinja2_extension('jinja2.ext.loopcontrols')
     config.add_jinja2_search_path('appenlight:templates')
     # event subscribers
     config.add_subscriber("appenlight.subscribers.application_created",
                           "pyramid.events.ApplicationCreated")
     config.add_subscriber("appenlight.subscribers.add_renderer_globals",
                           "pyramid.events.BeforeRender")
     config.add_subscriber('appenlight.subscribers.new_request',
                           'pyramid.events.NewRequest')
     config.add_view_predicate('context_type_class',
                               'appenlight.predicates.contextTypeClass')
 
     register_datastores(es_conn=config.registry.es_conn,
                         redis_conn=config.registry.redis_conn,
                         redis_lockmgr=config.registry.redis_lockmgr)
 
     # base stuff and scan
 
     # need to ensure webassets exists otherwise config.override_asset()
     # throws exception
     if not os.path.exists(settings['webassets.dir']):
         os.mkdir(settings['webassets.dir'])
     config.add_static_view(path='appenlight:webassets',
                            name='static', cache_max_age=3600)
     config.override_asset(to_override='appenlight:webassets/',
                           override_with=settings['webassets.dir'])
 
     config.include('appenlight.views')
     config.include('appenlight.views.admin')
     config.scan(ignore=['appenlight.migrations',
                         'appenlight.scripts',
                         'appenlight.tests'])
 
     # authomatic social auth
     authomatic_conf = {
         # callback http://yourapp.com/social_auth/twitter
         'twitter': {
             'class_': oauth1.Twitter,
             'consumer_key': settings.get('authomatic.pr.twitter.key', 'X'),
             'consumer_secret': settings.get('authomatic.pr.twitter.secret',
                                             'X'),
         },
         # callback http://yourapp.com/social_auth/facebook
         'facebook': {
             'class_': oauth2.Facebook,
             'consumer_key': settings.get('authomatic.pr.facebook.app_id', 'X'),
             'consumer_secret': settings.get('authomatic.pr.facebook.secret',
                                             'X'),
             'scope': ['email'],
         },
         # callback http://yourapp.com/social_auth/google
         'google': {
             'class_': oauth2.Google,
             'consumer_key': settings.get('authomatic.pr.google.key', 'X'),
             'consumer_secret': settings.get(
                 'authomatic.pr.google.secret', 'X'),
             'scope': ['profile', 'email'],
         },
         'github': {
             'class_': oauth2.GitHub,
             'consumer_key': settings.get('authomatic.pr.github.key', 'X'),
             'consumer_secret': settings.get(
                 'authomatic.pr.github.secret', 'X'),
             'scope': ['repo', 'public_repo', 'user:email'],
             'access_headers': {'User-Agent': 'AppEnlight'},
         },
         'bitbucket': {
             'class_': oauth1.Bitbucket,
             'consumer_key': settings.get('authomatic.pr.bitbucket.key', 'X'),
             'consumer_secret': settings.get(
                 'authomatic.pr.bitbucket.secret', 'X')
         }
     }
     config.registry.authomatic = Authomatic(
         config=authomatic_conf, secret=settings['authomatic.secret'])
 
     # resource type information
     config.registry.resource_types = ['resource', 'application']
 
     # plugin information
     config.registry.appenlight_plugins = {}
 
     def register_appenlight_plugin(config, plugin_name, plugin_config):
         def register():
             log.warning('Registering plugin: {}'.format(plugin_name))
             if plugin_name not in config.registry.appenlight_plugins:
                 config.registry.appenlight_plugins[plugin_name] = {
                     'javascript': None,
                     'static': None,
                     'css': None,
                     'top_nav': None,
                     'celery_tasks': None,
                     'celery_beats': None,
                     'fulltext_indexer': None,
                     'sqlalchemy_migrations': None,
                     'default_values_setter': None,
                     'resource_types': [],
                     'url_gen': None
                 }
             config.registry.appenlight_plugins[plugin_name].update(
                 plugin_config)
             # inform AE what kind of resource types we have available
             # so we can avoid failing when a plugin is removed but data
             # is still present in the db
             if plugin_config.get('resource_types'):
                 config.registry.resource_types.extend(
                     plugin_config['resource_types'])
 
         config.action('appenlight_plugin={}'.format(plugin_name), register)
 
     config.add_directive('register_appenlight_plugin',
                          register_appenlight_plugin)
 
     for entry_point in iter_entry_points(group='appenlight.plugins'):
         plugin = entry_point.load()
         plugin.includeme(config)
 
     # include other appenlight plugins explictly if needed
     includes = aslist(settings.get('appenlight.includes', []))
     for inc in includes:
         config.include(inc)
 
     # run this after everything registers in configurator
 
     def pre_commit():
         jinja_env = config.get_jinja2_environment()
         jinja_env.filters['tojson'] = json.dumps
         jinja_env.filters['toJSONUnsafe'] = jinja2_filters.toJSONUnsafe
 
     config.action(None, pre_commit, order=PHASE3_CONFIG + 999)
 
     def wrap_config_celery():
         configure_celery(config.registry)
 
     config.action(None, wrap_config_celery, order=PHASE3_CONFIG + 999)
 
     app = config.make_wsgi_app()
     return app

development.ini

@@ -1,196 +1,196 b''
 [app:appenlight]
 use = egg:appenlight
 reload_templates = true
 debug_authorization = true
 debug_notfound = true
 debug_routematch = true
 debug_templates = true
 default_locale_name = en
 sqlalchemy.url = postgresql://test:test@localhost/appenlight
 sqlalchemy.pool_size = 10
 sqlalchemy.max_overflow = 50
 sqlalchemy.echo = false
 jinja2.directories = appenlight:templates
 jinja2.filters = nl2br = appenlight.lib.jinja2_filters.nl2br
 
 
 pyramid.includes = pyramid_debugtoolbar
 
 debugtoolbar.panels =
     pyramid_debugtoolbar.panels.versions.VersionDebugPanel
     pyramid_debugtoolbar.panels.settings.SettingsDebugPanel
     pyramid_debugtoolbar.panels.headers.HeaderDebugPanel
     pyramid_debugtoolbar.panels.renderings.RenderingsDebugPanel
     pyramid_debugtoolbar.panels.logger.LoggingPanel
     pyramid_debugtoolbar.panels.performance.PerformanceDebugPanel
     pyramid_debugtoolbar.panels.routes.RoutesDebugPanel
     pyramid_debugtoolbar.panels.sqla.SQLADebugPanel
     pyramid_debugtoolbar.panels.tweens.TweensDebugPanel
     pyramid_debugtoolbar.panels.introspection.IntrospectionDebugPanel
 
 appenlight.includes =
 
 # encryption
 encryption_secret = oEOikr_T98wTh_xLH3w8Se3kmbgAQYSM4poZvPosya0=
 
 #redis
 redis.url = redis://localhost:6379/0
 redis.redlock.url = redis://localhost:6379/3
 
-#solr
+#elasticsearch
 elasticsearch.nodes = http://127.0.0.1:9200
 
 #dirs
 webassets.dir = %(here)s/webassets/
 
 #authtkt
 authtkt.secure = false
 authtkt.secret = SECRET
 # session settings
 redis.sessions.secret = SECRET
 redis.sessions.timeout = 86400
 
 # session cookie settings
 redis.sessions.cookie_name = appenlight
 redis.sessions.cookie_max_age = 2592000
 redis.sessions.cookie_path = /
 redis.sessions.cookie_domain =
 redis.sessions.cookie_secure = False
 redis.sessions.cookie_httponly = False
 redis.sessions.cookie_on_exception = True
 redis.sessions.prefix = appenlight:session:
 
 
 #cache
 cache.regions = default_term, second, short_term, long_term
 cache.type = ext:memcached
 cache.url = 127.0.0.1:11211
 cache.lock_dir = %(here)s/data/cache/lock
 cache.second.expire = 1
 cache.short_term.expire = 60
 cache.default_term.expire = 300
 
 #mailing
 mailing.app_url = http://localhost:6543
 mailing.from_name = App Enlight LOCAL
 mailing.from_email = [e-mail]
 
 
 ###
 # Authomatic configuration
 ###
 
 authomatic.secret = SECRET
 authomatic.pr.facebook.app_id =
 authomatic.pr.facebook.secret =
 authomatic.pr.twitter.key =
 authomatic.pr.twitter.secret =
 authomatic.pr.google.key =
 authomatic.pr.google.secret =
 authomatic.pr.github.key =
 authomatic.pr.github.secret =
 authomatic.pr.github.scope = repo, public_repo, user:email
 authomatic.pr.bitbucket.key =
 authomatic.pr.bitbucket.secret =
 
 #ziggurat
 ziggurat_foundations.model_locations.User = appenlight.models.user:User
 ziggurat_foundations.sign_in.username_key = sign_in_user_name
 ziggurat_foundations.sign_in.password_key = sign_in_user_password
 ziggurat_foundations.sign_in.came_from_key = came_from
 
 #cometd
 cometd.server = http://127.0.0.1:8088/
 cometd.secret = secret
 cometd.ws_url = http://127.0.0.1:8088/
 
 
 # for celery
 appenlight.api_key =
 appenlight.transport_config =
 appenlight.public_api_key =
 
 celery.broker_type = redis
 celery.broker_url = redis://localhost:6379/3
 celery.concurrency = 4
 celery.timezone = UTC
 
 
 [filter:paste_prefix]
 use = egg:PasteDeploy#prefix
 
 
 [filter:appenlight_client]
 use = egg:appenlight_client
 appenlight.api_key =
 appenlight.transport_config =
 appenlight.report_local_vars = true
 appenlight.report_404 = true
 appenlight.logging.level = DEBUG
 appenlight.timing.dbapi2_psycopg2 = 0.3
 
 
 [pipeline:main]
 pipeline =
     paste_prefix
     appenlight_client
     appenlight
 
 
 
 [server:main]
 use = egg:waitress
 host = 0.0.0.0
 port = 6543
 
 [server:main_prod]
 use = egg:gunicorn#main
 host = 0.0.0.0:6543, unix:/tmp/appenlight.sock
 workers = 6
 timeout = 90
 #max_requests = 1000
 
 
 # Begin logging configuration
 
 [loggers]
 keys = root, appenlight, sqlalchemy, elasticsearch
 
 [handlers]
 keys = console
 
 [formatters]
 keys = generic
 
 [logger_root]
 level = INFO
 handlers = console
 
 [logger_appenlight]
 level = INFO
 handlers =
 qualname = appenlight
 
 [logger_elasticsearch]
 level = WARN
 handlers =
 qualname = elasticsearch
 
 [logger_sqlalchemy]
 level = WARN
 handlers =
 qualname = sqlalchemy.engine
 # "level = INFO" logs SQL queries.
 # "level = DEBUG" logs SQL queries and results.
 # "level = WARN" logs neither.  (Recommended for production systems.)
 
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
 
 # End logging configuration

testing.ini

@@ -1,182 +1,182 b''
 [app:appenlight]
 use = egg:appenlight
 reload_templates = true
 debug_authorization = true
 debug_notfound = true
 debug_routematch = true
 debug_templates = true
 default_locale_name = en
 sqlalchemy.url = postgresql://test:test@localhost/appenlight_test
 sqlalchemy.pool_size = 2
 sqlalchemy.max_overflow = 5
 sqlalchemy.echo = false
 jinja2.directories = appenlight:templates
 jinja2.filters = nl2br = appenlight.lib.jinja2_filters.nl2br
 
 
 pyramid.includes = pyramid_debugtoolbar
 
 appenlight.includes =
 
 # encryption
 encryption_secret = oEOikr_T98wTh_xLH3w8Se3kmbgAQYSM4poZvPosya0=
 
 #redis
 redis.url = redis://localhost:6379/0
 redis.redlock.url = redis://localhost:6379/3
 
-#solr
+#elasticsearch
 elasticsearch.nodes = http://127.0.0.1:9200
 
 #dirs
 webassets.dir = %(here)s/webassets/
 
 #authtkt
 authtkt.secure = false
 authtkt.secret = SECRET
 # session settings
 redis.sessions.secret = SECRET
 redis.sessions.timeout = 3600
 
 # session cookie settings
 redis.sessions.cookie_name = appenlight
 redis.sessions.cookie_max_age = 2592000
 redis.sessions.cookie_path = /
 redis.sessions.cookie_domain =
 redis.sessions.cookie_secure = False
 redis.sessions.cookie_httponly = False
 redis.sessions.cookie_on_exception = True
 redis.sessions.prefix = appenlight:session:
 
 
 #cache
 cache.regions = default_term, second, short_term, long_term
 cache.type = ext:memcached
 cache.url = 127.0.0.1:11211
 cache.lock_dir = %(here)s/data/cache/lock
 cache.second.expire = 1
 cache.short_term.expire = 60
 cache.default_term.expire = 300
 
 #mailing
 mailing.app_url = https://appenlight.com
 mailing.from_name = App Enlight LOCAL
 mailing.from_email = [e-mail]
 
 
 ###
 # Authomatic configuration
 ###
 
 authomatic.secret = secret
 authomatic.pr.facebook.app_id =
 authomatic.pr.facebook.secret =
 authomatic.pr.twitter.key =
 authomatic.pr.twitter.secret =
 authomatic.pr.google.key =
 authomatic.pr.google.secret =
 authomatic.pr.github.key =
 authomatic.pr.github.secret =
 authomatic.pr.github.scope = repo, public_repo, user:email
 authomatic.pr.bitbucket.key =
 authomatic.pr.bitbucket.secret =
 
 #ziggurat
 ziggurat_foundations.model_locations.User = appenlight.models.user:User
 ziggurat_foundations.sign_in.username_key = sign_in_user_name
 ziggurat_foundations.sign_in.password_key = sign_in_user_password
 ziggurat_foundations.sign_in.came_from_key = came_from
 
 #cometd
 cometd.server = http://127.0.0.1:8088/
 cometd.secret = secret
 cometd.ws_url = wss://127.0.0.1:8088/
 
 
 # for celery
 appenlight.api_key =
 appenlight.transport_config = http://127.0.0.1:6543
 
 celery.broker_type = redis
 celery.broker_url = redis://localhost:6379/4
 celery.concurrency = 4
 celery.timezone = UTC
 celery.always_eager = true
 
 [filter:paste_prefix]
 use = egg:PasteDeploy#prefix
 
 
 [filter:appenlight_client]
 use = egg:appenlight_client
 appenlight.api_key =
 appenlight.transport_config = http://127.0.0.1:6543
 appenlight.report_local_vars = true
 appenlight.report_404 = true
 appenlight.timing.dbapi2_psycopg2 = 0.3
 
 
 [pipeline:main]
 pipeline =
     paste_prefix
     appenlight_client
     appenlight
 
 
 
 [server:main]
 use = egg:waitress
 host = 0.0.0.0
 port = 6543
 
 [server:main_prod]
 use = egg:gunicorn#main
 host = 0.0.0.0:6543, unix:/tmp/appenlight.sock
 workers = 6
 timeout = 90
 #max_requests = 1000
 
 
 # Begin logging configuration
 
 [loggers]
 keys = root, appenlight, sqlalchemy, elasticsearch
 
 [handlers]
 keys = console
 
 [formatters]
 keys = generic
 
 [logger_root]
 level = INFO
 handlers = console
 
 [logger_appenlight]
 level = INFO
 handlers =
 qualname = appenlight
 
 [logger_elasticsearch]
 level = WARN
 handlers =
 qualname = elasticsearch
 
 [logger_sqlalchemy]
 level = WARN
 handlers =
 qualname = sqlalchemy.engine
 # "level = INFO" logs SQL queries.
 # "level = DEBUG" logs SQL queries and results.
 # "level = WARN" logs neither.  (Recommended for production systems.)
 
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
 [formatter_generic]
 format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
 
 # End logging configuration