iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove coordinator in Druid Cluster config (#5164) (#6443)

This commit is contained in:
Jiaji Zhou 2018-11-27 09:41:16 -08:00 committed by Maxime Beauchemin
parent 2b2c650040
commit 1eb0d0d835
24 changed files with 36 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
superset/connectors/druid/models.py
View File

@ -80,18 +80,13 @@ class DruidCluster(Model, AuditMixinNullable, ImportMixin):
verbose_name = Column(String(250), unique=True)
# short unique name, used in permissions
cluster_name = Column(String(250), unique=True)
coordinator_host = Column(String(255))
coordinator_port = Column(Integer, default=8081)
coordinator_endpoint = Column(
String(255), default='druid/coordinator/v1/metadata')
broker_host = Column(String(255))
broker_port = Column(Integer, default=8082)
broker_endpoint = Column(String(255), default='druid/v2')
metadata_last_refreshed = Column(DateTime)
cache_timeout = Column(Integer)
export_fields = ('cluster_name', 'coordinator_host', 'coordinator_port',
'coordinator_endpoint', 'broker_host', 'broker_port',
export_fields = ('cluster_name', 'broker_host', 'broker_port',
'broker_endpoint', 'cache_timeout')
update_from_object_fields = export_fields
export_children = ['datasources']
@ -135,7 +130,7 @@ class DruidCluster(Model, AuditMixinNullable, ImportMixin):
def get_druid_version(self):
endpoint = self.get_base_url(
self.coordinator_host, self.coordinator_port) + '/status'
self.broker_host, self.broker_port) + '/status'
return json.loads(requests.get(endpoint).text)['version']
@property

6
superset/connectors/druid/views.py
View File

@ -158,8 +158,7 @@ class DruidClusterModelView(SupersetModelView, DeleteMixin, YamlExportMixin): #
edit_title = _('Edit Druid Cluster')
add_columns = [
'verbose_name', 'coordinator_host', 'coordinator_port',
'coordinator_endpoint', 'broker_host', 'broker_port',
'verbose_name', 'broker_host', 'broker_port',
'broker_endpoint', 'cache_timeout', 'cluster_name',
]
edit_columns = add_columns
@ -167,9 +166,6 @@ class DruidClusterModelView(SupersetModelView, DeleteMixin, YamlExportMixin): #
search_columns = ('cluster_name',)
label_columns = {
'cluster_name': _('Cluster'),
'coordinator_host': _('Coordinator Host'),
'coordinator_port': _('Coordinator Port'),
'coordinator_endpoint': _('Coordinator Endpoint'),
'broker_host': _('Broker Host'),
'broker_port': _('Broker Port'),
'broker_endpoint': _('Broker Endpoint'),

31
superset/migrations/versions/46f444d8b9b7_remove_coordinator_from_druid_cluster_.py Normal file
View File

@ -0,0 +1,31 @@
"""remove_coordinator_from_druid_cluster_model.py
Revision ID: 46f444d8b9b7
Revises: 4ce8df208545
Create Date: 2018-11-26 00:01:04.781119
"""
# revision identifiers, used by Alembic.
revision = '46f444d8b9b7'
down_revision = '4ce8df208545'
from alembic import op
import sqlalchemy as sa
import logging
def upgrade():
try:
op.drop_column('clusters', 'coordinator_host')
op.drop_column('clusters', 'coordinator_endpoint')
op.drop_column('clusters', 'coordinator_port')
except Exception as e:
# Sqlite does not support drop column
logging.warning(str(e))
def downgrade():
op.add_column('clusters', sa.Column('coordinator_host', sa.String(length=256), nullable=True))
op.add_column('clusters', sa.Column('coordinator_port', sa.Integer(), nullable=True))
op.add_column('clusters', sa.Column('coordinator_endpoint', sa.String(length=256), nullable=True))

9
superset/translations/de/LC_MESSAGES/messages.json
View File

@ -1891,15 +1891,6 @@
"Cluster": [
""
],
"Coordinator Host": [
""
],
"Coordinator Port": [
""
],
"Coordinator Endpoint": [
""
],
"Broker Host": [
""
],

12
superset/translations/de/LC_MESSAGES/messages.po
View File

@ -2826,18 +2826,6 @@ msgstr "Druid Cluster bearbeiten"
msgid "Cluster"
msgstr ""
#: superset/connectors/druid/views.py:144
msgid "Coordinator Host"
msgstr ""
#: superset/connectors/druid/views.py:145
msgid "Coordinator Port"
msgstr ""
#: superset/connectors/druid/views.py:146
msgid "Coordinator Endpoint"
msgstr ""
#: superset/connectors/druid/views.py:147
msgid "Broker Host"
msgstr ""

21
superset/translations/en/LC_MESSAGES/messages.po
View File

@ -4105,18 +4105,6 @@ msgstr ""
msgid "Cluster"
msgstr ""
#: superset/connectors/druid/views.py:172
msgid "Coordinator Host"
msgstr ""
#: superset/connectors/druid/views.py:173
msgid "Coordinator Port"
msgstr ""
#: superset/connectors/druid/views.py:174
msgid "Coordinator Endpoint"
msgstr ""
#: superset/connectors/druid/views.py:175
msgid "Broker Host"
msgstr ""
@ -7134,15 +7122,6 @@ msgstr ""
#~ msgid "Cluster"
#~ msgstr ""
#~ msgid "Coordinator Host"
#~ msgstr ""
#~ msgid "Coordinator Port"
#~ msgstr ""
#~ msgid "Coordinator Endpoint"
#~ msgstr ""
#~ msgid "Broker Host"
#~ msgstr ""

9
superset/translations/es/LC_MESSAGES/messages.json
View File

@ -1891,15 +1891,6 @@
"Cluster": [
"Cluster"
],
"Coordinator Host": [
""
],
"Coordinator Port": [
""
],
"Coordinator Endpoint": [
""
],
"Broker Host": [
""
],

12
superset/translations/es/LC_MESSAGES/messages.po
View File

@ -2959,18 +2959,6 @@ msgstr "Editar Cluster Druid"
msgid "Cluster"
msgstr "Cluster"
#: superset/connectors/druid/views.py:144
msgid "Coordinator Host"
msgstr "Host Coordinador"
#: superset/connectors/druid/views.py:145
msgid "Coordinator Port"
msgstr "Puerto Coordinador"
#: superset/connectors/druid/views.py:146
msgid "Coordinator Endpoint"
msgstr "Coordinador Endpoint"
#: superset/connectors/druid/views.py:147
msgid "Broker Host"
msgstr "Host Broker"

9
superset/translations/fr/LC_MESSAGES/messages.json
View File

@ -2761,15 +2761,6 @@
"Cluster": [
"Cluster"
],
"Coordinator Host": [
"Hôte du coordinator"
],
"Coordinator Port": [
"Port du coordinator"
],
"Coordinator Endpoint": [
"Endpoint du coordinator"
],
"Broker Host": [
"Hôte du Broker"
],

12
superset/translations/fr/LC_MESSAGES/messages.po
View File

@ -4114,18 +4114,6 @@ msgstr "Éditer une cluster Druid"
msgid "Cluster"
msgstr "Cluster"
#: superset/connectors/druid/views.py:172
msgid "Coordinator Host"
msgstr "Hôte du coordinator"
#: superset/connectors/druid/views.py:173
msgid "Coordinator Port"
msgstr "Port du coordinator"
#: superset/connectors/druid/views.py:174
msgid "Coordinator Endpoint"
msgstr "Endpoint du coordinator"
#: superset/connectors/druid/views.py:175
msgid "Broker Host"
msgstr "Hôte du Broker"

9
superset/translations/it/LC_MESSAGES/messages.json
View File

@ -2572,15 +2572,6 @@
"Cluster": [
"Cluster"
],
"Coordinator Host": [
"Host Coordinatore"
],
"Coordinator Port": [
"Porta Coordinatore"
],
"Coordinator Endpoint": [
"Endpoint Coordinatore"
],
"Broker Host": [
"Host Broker"
],

12
superset/translations/it/LC_MESSAGES/messages.po
View File

@ -3844,18 +3844,6 @@ msgstr ""
msgid "Cluster"
msgstr "Cluster"
#: superset/connectors/druid/views.py:165
msgid "Coordinator Host"
msgstr "Host Coordinatore"
#: superset/connectors/druid/views.py:166
msgid "Coordinator Port"
msgstr "Porta Coordinatore"
#: superset/connectors/druid/views.py:167
msgid "Coordinator Endpoint"
msgstr "Endpoint Coordinatore"
#: superset/connectors/druid/views.py:168
msgid "Broker Host"
msgstr "Host Broker"

9
superset/translations/ja/LC_MESSAGES/messages.json
View File

@ -1909,15 +1909,6 @@
"Cluster": [
""
],
"Coordinator Host": [
""
],
"Coordinator Port": [
""
],
"Coordinator Endpoint": [
""
],
"Broker Host": [
""
],

12
superset/translations/ja/LC_MESSAGES/messages.po
View File

@ -2851,18 +2851,6 @@ msgstr ""
msgid "Cluster"
msgstr ""
#: superset/connectors/druid/views.py:144
msgid "Coordinator Host"
msgstr ""
#: superset/connectors/druid/views.py:145
msgid "Coordinator Port"
msgstr ""
#: superset/connectors/druid/views.py:146
msgid "Coordinator Endpoint"
msgstr ""
#: superset/connectors/druid/views.py:147
msgid "Broker Host"
msgstr ""

12
superset/translations/messages.pot
View File

@ -4104,18 +4104,6 @@ msgstr ""
msgid "Cluster"
msgstr ""
#: superset/connectors/druid/views.py:172
msgid "Coordinator Host"
msgstr ""
#: superset/connectors/druid/views.py:173
msgid "Coordinator Port"
msgstr ""
#: superset/connectors/druid/views.py:174
msgid "Coordinator Endpoint"
msgstr ""
#: superset/connectors/druid/views.py:175
msgid "Broker Host"
msgstr ""

12
superset/translations/pt/LC_MESSAGES/message.po
View File

@ -3289,18 +3289,6 @@ msgstr "Editar Cluster Druid"
msgid "Cluster"
msgstr "Cluster"
#: superset/connectors/druid/views.py:142
msgid "Coordinator Host"
msgstr "Anfitrião Coordenador"
#: superset/connectors/druid/views.py:143
msgid "Coordinator Port"
msgstr "Porta Coordenador"
#: superset/connectors/druid/views.py:144
msgid "Coordinator Endpoint"
msgstr "Endpoint Coordenador"
#: superset/connectors/druid/views.py:145
#, fuzzy
msgid "Broker Host"

2
superset/translations/pt/LC_MESSAGES/messages.json
View File

File diff suppressed because one or more lines are too long

9
superset/translations/pt_BR/LC_MESSAGES/messages.json
View File

@ -2100,15 +2100,6 @@
"Cluster": [
"Grupo"
],
"Coordinator Host": [
"Coordenador de Host"
],
"Coordinator Port": [
"Porto Coordenador"
],
"Coordinator Endpoint": [
"Ponto final do coordenador"
],
"Broker Host": [
"Host de corretor"
],

12
superset/translations/pt_BR/LC_MESSAGES/messages.po
View File

@ -3253,18 +3253,6 @@ msgstr "Editar Druid Cluster"
msgid "Cluster"
msgstr "Grupo"
#: superset/connectors/druid/views.py:142
msgid "Coordinator Host"
msgstr "Coordenador de Host"
#: superset/connectors/druid/views.py:143
msgid "Coordinator Port"
msgstr "Porto Coordenador"
#: superset/connectors/druid/views.py:144
msgid "Coordinator Endpoint"
msgstr "Ponto final do coordenador"
#: superset/connectors/druid/views.py:145
msgid "Broker Host"
msgstr "Host de corretor"

9
superset/translations/ru/LC_MESSAGES/messages.json
View File

@ -2572,15 +2572,6 @@
"Cluster": [
"Кластер"
],
"Coordinator Host": [
"Координатор Хост"
],
"Coordinator Port": [
"Координатор Порт"
],
"Coordinator Endpoint": [
"Координатор Конечная Точка"
],
"Broker Host": [
"Брокер-Хост"
],

12
superset/translations/ru/LC_MESSAGES/messages.po
View File

@ -3953,18 +3953,6 @@ msgstr "Редактировать Кластер Druid"
msgid "Cluster"
msgstr "Кластер"
#: superset/connectors/druid/views.py:165
msgid "Coordinator Host"
msgstr "Координатор Хост"
#: superset/connectors/druid/views.py:166
msgid "Coordinator Port"
msgstr "Координатор Порт"
#: superset/connectors/druid/views.py:167
msgid "Coordinator Endpoint"
msgstr "Координатор Конечная Точка"
#: superset/connectors/druid/views.py:168
msgid "Broker Host"
msgstr "Брокер-Хост"

2
superset/translations/zh/LC_MESSAGES/messages.json
View File

File diff suppressed because one or more lines are too long

12
superset/translations/zh/LC_MESSAGES/messages.po
View File

@ -4110,18 +4110,6 @@ msgstr "编辑 Druid 集群"
msgid "Cluster"
msgstr "集群"
#: superset/connectors/druid/views.py:172
msgid "Coordinator Host"
msgstr "协调器主机"
#: superset/connectors/druid/views.py:173
msgid "Coordinator Port"
msgstr "协调器端口"
#: superset/connectors/druid/views.py:174
msgid "Coordinator Endpoint"
msgstr "协调器端点"
#: superset/connectors/druid/views.py:175
msgid "Broker Host"
msgstr "代理主机"

5
tests/druid_tests.py
View File

@ -84,9 +84,6 @@ class DruidTests(SupersetTestCase):
def get_test_cluster_obj(self):
return DruidCluster(
cluster_name='test_cluster',
coordinator_host='localhost',
coordinator_endpoint='druid/coordinator/v1/metadata',
coordinator_port=7979,
broker_host='localhost',
broker_port=7980,
broker_endpoint='druid/v2',
@ -311,8 +308,6 @@ class DruidTests(SupersetTestCase):
cluster = DruidCluster(
cluster_name='test_cluster',
coordinator_host='localhost',
coordinator_port=7979,
broker_host='localhost',
broker_port=7980,
metadata_last_refreshed=datetime.now())