-
+
+
diff --git a/web-console/src/utils/capabilities.ts b/web-console/src/utils/capabilities.ts
new file mode 100644
index 00000000000..a422752ec6e
--- /dev/null
+++ b/web-console/src/utils/capabilities.ts
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type Capabilities = 'full' | 'no-sql' | 'no-proxy' | 'broken';
diff --git a/web-console/src/views/datasource-view/datasource-view.spec.tsx b/web-console/src/views/datasource-view/datasource-view.spec.tsx
index 7bb670cf5e5..4b311461214 100644
--- a/web-console/src/views/datasource-view/datasource-view.spec.tsx
+++ b/web-console/src/views/datasource-view/datasource-view.spec.tsx
@@ -28,7 +28,7 @@ describe('data source view', () => {
goToQuery={() => {}}
goToTask={() => null}
goToSegments={() => {}}
- noSqlMode={false}
+ capabilities="full"
/>,
);
expect(dataSourceView).toMatchSnapshot();
diff --git a/web-console/src/views/datasource-view/datasource-view.tsx b/web-console/src/views/datasource-view/datasource-view.tsx
index 4c0936b64d6..27f9bf57b88 100644
--- a/web-console/src/views/datasource-view/datasource-view.tsx
+++ b/web-console/src/views/datasource-view/datasource-view.tsx
@@ -61,34 +61,48 @@ import {
QueryManager,
} from '../../utils';
import { BasicAction } from '../../utils/basic-action';
+import { Capabilities } from '../../utils/capabilities';
import { RuleUtil } from '../../utils/load-rule';
import { LocalStorageBackedArray } from '../../utils/local-storage-backed-array';
import { deepGet } from '../../utils/object-change';
import './datasource-view.scss';
-const tableColumns: string[] = [
- 'Datasource',
- 'Availability',
- 'Segment load/drop',
- 'Retention',
- 'Replicated size',
- 'Size',
- 'Compaction',
- 'Avg. segment size',
- 'Num rows',
- ACTION_COLUMN_LABEL,
-];
-const tableColumnsNoSql: string[] = [
- 'Datasource',
- 'Availability',
- 'Segment load/drop',
- 'Retention',
- 'Size',
- 'Compaction',
- 'Avg. segment size',
- ACTION_COLUMN_LABEL,
-];
+const tableColumns: Record
= {
+ full: [
+ 'Datasource',
+ 'Availability',
+ 'Segment load/drop',
+ 'Retention',
+ 'Replicated size',
+ 'Size',
+ 'Compaction',
+ 'Avg. segment size',
+ 'Num rows',
+ ACTION_COLUMN_LABEL,
+ ],
+ 'no-sql': [
+ 'Datasource',
+ 'Availability',
+ 'Segment load/drop',
+ 'Retention',
+ 'Size',
+ 'Compaction',
+ 'Avg. segment size',
+ ACTION_COLUMN_LABEL,
+ ],
+ 'no-proxy': [
+ 'Datasource',
+ 'Availability',
+ 'Segment load/drop',
+ 'Replicated size',
+ 'Size',
+ 'Avg. segment size',
+ 'Num rows',
+ ACTION_COLUMN_LABEL,
+ ],
+ broken: ['Datasource'],
+};
function formatLoadDrop(segmentsToLoad: number, segmentsToDrop: number): string {
const loadDrop: string[] = [];
@@ -133,7 +147,7 @@ export interface DatasourcesViewProps {
goToQuery: (initSql: string) => void;
goToTask: (datasource?: string, openDialog?: string) => void;
goToSegments: (datasource: string, onlyUnavailable?: boolean) => void;
- noSqlMode: boolean;
+ capabilities: Capabilities;
initDatasource?: string;
}
@@ -198,7 +212,7 @@ GROUP BY 1`;
}
private datasourceQueryManager: QueryManager<
- boolean,
+ Capabilities,
{ tiers: string[]; defaultRules: any[]; datasources: Datasource[] }
>;
@@ -231,9 +245,9 @@ GROUP BY 1`;
};
this.datasourceQueryManager = new QueryManager({
- processQuery: async noSqlMode => {
+ processQuery: async capabilities => {
let datasources: DatasourceQueryResultRow[];
- if (!noSqlMode) {
+ if (capabilities !== 'no-sql') {
datasources = await queryDruidSql({ query: DatasourcesView.DATASOURCE_SQL });
} else {
const datasourcesResp = await axios.get('/druid/coordinator/v1/datasources?simple');
@@ -260,6 +274,17 @@ GROUP BY 1`;
);
}
+ if (capabilities === 'no-proxy') {
+ datasources.forEach((ds: any) => {
+ ds.rules = [];
+ });
+ return {
+ datasources,
+ tiers: [],
+ defaultRules: [],
+ };
+ }
+
const seen = countBy(datasources, (x: any) => x.datasource);
let disabled: string[] = [];
@@ -320,8 +345,8 @@ GROUP BY 1`;
};
componentDidMount(): void {
- const { noSqlMode } = this.props;
- this.datasourceQueryManager.runQuery(noSqlMode);
+ const { capabilities } = this.props;
+ this.datasourceQueryManager.runQuery(capabilities);
window.addEventListener('resize', this.handleResize);
}
@@ -468,10 +493,10 @@ GROUP BY 1`;
}
renderBulkDatasourceActions() {
- const { goToQuery, noSqlMode } = this.props;
+ const { goToQuery, capabilities } = this.props;
const bulkDatasourceActionsMenu = (
diff --git a/web-console/src/views/home-view/datasources-card/datasources-card.spec.tsx b/web-console/src/views/home-view/datasources-card/datasources-card.spec.tsx
index edc4b9ec975..da5dd08f70a 100644
--- a/web-console/src/views/home-view/datasources-card/datasources-card.spec.tsx
+++ b/web-console/src/views/home-view/datasources-card/datasources-card.spec.tsx
@@ -23,7 +23,7 @@ import { DatasourcesCard } from './datasources-card';
describe('datasources card', () => {
it('matches snapshot', () => {
- const datasourcesCard =