Skip to content

Commit 0cc8112

Browse files
authored
Merge pull request #115 from jcantrill/bz1519705_all_failure_non_ops
fix 1519705. All alias shows now indices
2 parents b2d520a + 9da1c28 commit 0cc8112

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/java/io/fabric8/elasticsearch/plugin/kibana/KibanaSeed.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ public void setDashboards(final OpenshiftRequestContext context, Client client,
9999
LOGGER.debug("Found '{}' Index patterns for user", indexPatterns.size());
100100

101101
Set<String> projects = new HashSet<>(context.getProjects());
102+
if(context.isOperationsUser()) {
103+
projects.add(OPERATIONS_PROJECT);
104+
}
102105
List<String> filteredProjects = new ArrayList<String>(filterProjectsWithIndices(projectPrefix, projects));
103106
LOGGER.debug("projects for '{}' that have existing indexes: '{}'", context.getUser(), filteredProjects);
104107

@@ -161,7 +164,6 @@ private void addAliasToAllProjects(final OpenshiftRequestContext context, List<S
161164
if (context.isOperationsUser()) {
162165
// Check roles here, if user is a cluster-admin we should add
163166
LOGGER.debug("Adding indexes to alias '{}' for user '{}'", ADMIN_ALIAS_NAME, context.getUser());
164-
filteredProjects.add(OPERATIONS_PROJECT);
165167
buildAdminAlias(filteredProjects, projectPrefix);
166168
filteredProjects.add(ADMIN_ALIAS_NAME);
167169
} else if (filteredProjects.isEmpty()) {

0 commit comments

Comments
 (0)