Skip to content

Commit

Permalink
add more properties to opensearch_dashboards job spec for multitenanc…
Browse files Browse the repository at this point in the history
…y and set default for enable_private to false
  • Loading branch information
markdboyd committed Sep 23, 2024
1 parent 8686242 commit 41256ec
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 13 deletions.
30 changes: 21 additions & 9 deletions jobs/opensearch_dashboards/spec
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ templates:
config/ca.erb: config/ssl/opensearch.ca

consumes:
- name: opensearch
type: opensearch
optional: true
- name: opensearch
type: opensearch
optional: true

provides:
- name: opensearch_dashboards
type: opensearch_dashboards
properties:
- opensearch_dashboards.port
- opensearch_dashboards.server.ssl.certificate
- opensearch_dashboards.server.ssl.private_key
- name: opensearch_dashboards
type: opensearch_dashboards
properties:
- opensearch_dashboards.port
- opensearch_dashboards.server.ssl.certificate
- opensearch_dashboards.server.ssl.private_key

properties:
opensearch_dashboards.username:
Expand Down Expand Up @@ -101,3 +101,15 @@ properties:
opensearch_dashboards.health.timeout:
description: opensearch_dashboards health check number of attempts (seconds)
default: 300
opensearch_dashboards.multitenancy.enabled:
description: "whether multitenancy is enabled for OpenSearch Dashboards"
default: true
opensearch_dashboards.multitenancy.enable_filter:
description: "whether a search bar appears for searching enabled tenants"
default: true
opensearch_dashboards.multitenancy.tenants.enable_global:
description: "whether the global tenant is available on OpenSearch Dashboards"
default: false
opensearch_dashboards.multitenancy.tenants.enable_private:
description: "whether the private tenant is available on OpenSearch Dashboards"
default: false
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ opensearch_security.proxycache.user_header: "x-proxy-user"
opensearch_security.proxycache.roles_header: "x-proxy-roles"
<% end %>

opensearch_security.multitenancy.enabled: true
opensearch_security.multitenancy.tenants.enable_global: false
opensearch_security.multitenancy.tenants.enable_private: true
opensearch_security.multitenancy.enable_filter: false
opensearch_security.multitenancy.enabled: <%= p('opensearch_dashboards.multitenancy.enabled') %>
opensearch_security.multitenancy.tenants.enable_global: <%= p('opensearch_dashboards.multitenancy.tenants.enable_global') %>
opensearch_security.multitenancy.tenants.enable_private: <%= p('opensearch_dashboards.multitenancy.tenants.enable_private') %>
opensearch_security.multitenancy.enable_filter: <%= p('opensearch_dashboards.multitenancy.enable_filter') %>

<% if_p('opensearch_dashboards.config_options') do p("opensearch_dashboards.config_options", {}).each do | k, v | %>
<%= k %>: <%= v %><% end %>
Expand Down

0 comments on commit 41256ec

Please sign in to comment.