Skip to content

Commit b3ee5de

Browse files
geidogeido
committed
Merge
2 parents d3841cc + 64ad70c commit b3ee5de

File tree

124 files changed

+10000
-4259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+10000
-4259
lines changed

‎RESOURCES/FEATURE_FLAGS.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ These features are **finished** but currently being tested. They are usable, but
5656
- DASHBOARD_FILTERS_EXPERIMENTAL
5757
- DASHBOARD_NATIVE_FILTERS
5858
- DYNAMIC_PLUGINS: [(docs)](https://superset.apache.org/docs/installation/running-on-kubernetes)
59-
- ENABLE_FILTER_BOX_MIGRATION
6059
- ENABLE_JAVASCRIPT_CONTROLS
6160
- GENERIC_CHART_AXES
6261
- GLOBAL_ASYNC_QUERIES [(docs)](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#async-chart-queries)

‎UPDATING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ assists people when migrating to a new version.
4444

4545
### Other
4646

47+
- [23118](https://github.com/apache/superset/pull/23118): Previously the "database access on <database>" permission granted access to all datasets on the underlying database, but they didn't show up on the list views. Now all dashboards, charts and datasets that are accessible via this permission will also show up on their respective list views.
48+
4749
## 2.0.1
4850

4951
- [21895](https://github.com/apache/superset/pull/21895): Markdown components had their security increased by adhering to the same sanitization process enforced by Github. This means that some HTML elements found in markdowns are not allowed anymore due to the security risks they impose. If you're deploying Superset in a trusted environment and wish to use some of the blocked elements, then you can use the HTML_SANITIZATION_SCHEMA_EXTENSIONS configuration to extend the default sanitization schema. There's also the option to disable HTML sanitization using the HTML_SANITIZATION configuration but we do not recommend this approach because of the security risks. Given the provided configurations, we don't view the improved sanitization as a breaking change but as a security patch.

‎docs/docs/installation/installing-superset-from-scratch.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ We don't recommend using the system installed Python. Instead, first install the
6161
[homebrew](https://brew.sh/) manager and then run the following commands:
6262

6363
```
64-
brew install readline pkg-config libffi openssl mysql postgres
64+
brew install readline pkg-config libffi openssl mysql postgresql
6565
```
6666

6767
You should install a recent version of Python (the official docker image uses 3.8.16). We'd recommend using a Python version manager like [pyenv](https://github.com/pyenv/pyenv) (and also [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv)).

‎docs/static/resources/openapi.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10716,6 +10716,18 @@
1071610716
"passwords": {
1071710717
"description": "JSON map of passwords for each featured database in the ZIP file. If the ZIP includes a database config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
1071810718
"type": "string"
10719+
},
10720+
"ssh_tunnel_passwords": {
10721+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
10722+
"type": "string"
10723+
},
10724+
"ssh_tunnel_private_keys": {
10725+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
10726+
"type": "string"
10727+
},
10728+
"ssh_tunnel_private_keyspasswords": {
10729+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
10730+
"type": "string"
1071910731
}
1072010732
},
1072110733
"type": "object"
@@ -11439,6 +11451,18 @@
1143911451
"passwords": {
1144011452
"description": "JSON map of passwords for each featured database in the ZIP file. If the ZIP includes a database config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
1144111453
"type": "string"
11454+
},
11455+
"ssh_tunnel_passwords": {
11456+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
11457+
"type": "string"
11458+
},
11459+
"ssh_tunnel_private_keys": {
11460+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
11461+
"type": "string"
11462+
},
11463+
"ssh_tunnel_private_keyspasswords": {
11464+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
11465+
"type": "string"
1144211466
}
1144311467
},
1144411468
"type": "object"
@@ -13020,6 +13044,18 @@
1302013044
"passwords": {
1302113045
"description": "JSON map of passwords for each featured database in the ZIP file. If the ZIP includes a database config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
1302213046
"type": "string"
13047+
},
13048+
"ssh_tunnel_passwords": {
13049+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
13050+
"type": "string"
13051+
},
13052+
"ssh_tunnel_private_keys": {
13053+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
13054+
"type": "string"
13055+
},
13056+
"ssh_tunnel_private_keyspasswords": {
13057+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
13058+
"type": "string"
1302313059
}
1302413060
},
1302513061
"type": "object"
@@ -14788,6 +14824,18 @@
1478814824
"passwords": {
1478914825
"description": "JSON map of passwords for each featured database in the ZIP file. If the ZIP includes a database config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
1479014826
"type": "string"
14827+
},
14828+
"ssh_tunnel_passwords": {
14829+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
14830+
"type": "string"
14831+
},
14832+
"ssh_tunnel_private_keys": {
14833+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
14834+
"type": "string"
14835+
},
14836+
"ssh_tunnel_private_keyspasswords": {
14837+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
14838+
"type": "string"
1479114839
}
1479214840
},
1479314841
"type": "object"
@@ -16231,6 +16279,18 @@
1623116279
"sync_metrics": {
1623216280
"description": "sync metrics?",
1623316281
"type": "boolean"
16282+
},
16283+
"ssh_tunnel_passwords": {
16284+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
16285+
"type": "string"
16286+
},
16287+
"ssh_tunnel_private_keys": {
16288+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
16289+
"type": "string"
16290+
},
16291+
"ssh_tunnel_private_keyspasswords": {
16292+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
16293+
"type": "string"
1623416294
}
1623516295
},
1623616296
"type": "object"
@@ -19428,6 +19488,18 @@
1942819488
"passwords": {
1942919489
"description": "JSON map of passwords for each featured database in the ZIP file. If the ZIP includes a database config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
1943019490
"type": "string"
19491+
},
19492+
"ssh_tunnel_passwords": {
19493+
"description": "JSON map of passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_password\"}`.",
19494+
"type": "string"
19495+
},
19496+
"ssh_tunnel_private_keys": {
19497+
"description": "JSON map of private_keys for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key\"}`.",
19498+
"type": "string"
19499+
},
19500+
"ssh_tunnel_private_keyspasswords": {
19501+
"description": "JSON map of private_key_passwords for each ssh_tunnel associated to a featured database in the ZIP file. If the ZIP includes a ssh_tunnel config in the path `databases/MyDatabase.yaml`, the private_key_password should be provided in the following format: `{\"databases/MyDatabase.yaml\": \"my_private_key_password\"}`.",
19502+
"type": "string"
1943119503
}
1943219504
},
1943319505
"type": "object"

‎helm/superset/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ maintainers:
2929
- name: craig-rueda
3030
email: [email protected]
3131
url: https://github.com/craig-rueda
32-
version: 0.8.6
32+
version: 0.8.7
3333
dependencies:
3434
- name: postgresql
3535
version: 12.1.6

‎helm/superset/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
2323

2424
# superset
2525

26-
![Version: 0.8.6](https://img.shields.io/badge/Version-0.8.6-informational?style=flat-square)
26+
![Version: 0.8.7](https://img.shields.io/badge/Version-0.8.7-informational?style=flat-square)
2727

2828
Apache Superset is a modern, enterprise-ready business intelligence web application
2929

@@ -170,6 +170,7 @@ helm install my-superset superset/superset
170170
| supersetNode.deploymentAnnotations | object | `{}` | Annotations to be added to supersetNode deployment |
171171
| supersetNode.deploymentLabels | object | `{}` | Labels to be added to supersetNode deployment |
172172
| supersetNode.env | object | `{}` | |
173+
| supersetNode.extraContainers | list | `[]` | Launch additional containers into supersetNode pod |
173174
| supersetNode.forceReload | bool | `false` | If true, forces deployment to reload on each upgrade |
174175
| supersetNode.initContainers | list | a container waiting for postgres | Init containers |
175176
| supersetNode.livenessProbe.failureThreshold | int | `3` | |
@@ -247,6 +248,7 @@ helm install my-superset superset/superset
247248
| supersetWorker.containerSecurityContext | object | `{}` | |
248249
| supersetWorker.deploymentAnnotations | object | `{}` | Annotations to be added to supersetWorker deployment |
249250
| supersetWorker.deploymentLabels | object | `{}` | Labels to be added to supersetWorker deployment |
251+
| supersetWorker.extraContainers | list | `[]` | Launch additional containers into supersetWorker pod |
250252
| supersetWorker.forceReload | bool | `false` | If true, forces deployment to reload on each upgrade |
251253
| supersetWorker.initContainers | list | a container waiting for postgres and redis | Init container |
252254
| supersetWorker.livenessProbe.exec.command | list | a `celery inspect ping` command | Liveness probe command |

‎helm/superset/templates/deployment-worker.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ spec:
135135
{{- else }}
136136
{{- toYaml .Values.resources | nindent 12 }}
137137
{{- end }}
138+
{{- if .Values.supersetWorker.extraContainers }}
139+
{{- toYaml .Values.supersetWorker.extraContainers | nindent 8 }}
140+
{{- end }}
138141
{{- with .Values.nodeSelector }}
139142
nodeSelector:
140143
{{- toYaml . | nindent 8 }}

‎helm/superset/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ spec:
146146
{{- else }}
147147
{{- toYaml .Values.resources | nindent 12 }}
148148
{{- end }}
149+
{{- if .Values.supersetNode.extraContainers }}
150+
{{- toYaml .Values.supersetNode.extraContainers | nindent 8 }}
151+
{{- end }}
149152
{{- with .Values.nodeSelector }}
150153
nodeSelector:
151154
{{- toYaml . | nindent 8 }}

‎helm/superset/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ supersetNode:
282282
- -c
283283
- dockerize -wait "tcp://$DB_HOST:$DB_PORT" -timeout 120s
284284

285+
# -- Launch additional containers into supersetNode pod
286+
extraContainers: []
285287
# -- Annotations to be added to supersetNode deployment
286288
deploymentAnnotations: {}
287289
# -- Labels to be added to supersetNode deployment
@@ -363,6 +365,8 @@ supersetWorker:
363365
- /bin/sh
364366
- -c
365367
- dockerize -wait "tcp://$DB_HOST:$DB_PORT" -wait "tcp://$REDIS_HOST:$REDIS_PORT" -timeout 120s
368+
# -- Launch additional containers into supersetWorker pod
369+
extraContainers: []
366370
# -- Annotations to be added to supersetWorker deployment
367371
deploymentAnnotations: {}
368372
# -- Labels to be added to supersetWorker deployment

‎requirements/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ flask==2.1.3
8282
# flask-migrate
8383
# flask-sqlalchemy
8484
# flask-wtf
85-
flask-appbuilder==4.2.0
85+
flask-appbuilder==4.3.0
8686
# via apache-superset
8787
flask-babel==1.0.0
8888
# via flask-appbuilder

0 commit comments

Comments
 (0)