Skip to content

use Select component for now because of Grafana 10 support, minor fixes #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DNikolaevAtRocket merged 1 commit into from
Oct 16, 2025
Merged

use Select component for now because of Grafana 10 support, minor fixes #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grafana/rmf-app/src/components/Root/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export class Root extends PureComponent<Props, State> {
</p>
<p>
<p>
Link it with OMEGAMON dashboards (experimental):
Link with IBM Z OMEGAMON Web UI dashboards:
<Space layout={'inline'} h={2} />
<InlineSwitch transparent={true} defaultChecked={falcon.enabled}
onChange={e => {
Expand Down
43 changes: 34 additions & 9 deletions grafana/rmf-app/src/datasources/rmf-datasource/config-editor/config-editor.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React, { PureComponent, ReactNode } from 'react';
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
import { FieldValidationMessage, InlineField, InlineSwitch, LegacyForms, SecretInput, Combobox, ComboboxOption } from '@grafana/ui';
import React, { PureComponent } from 'react';
import { DataSourcePluginOptionsEditorProps, SelectableValue } from '@grafana/data';
import { FieldValidationMessage, InlineField, InlineSwitch, LegacyForms, SecretInput, Select, ComboboxOption } from '@grafana/ui';
import { RMFDataSourceSettings, RMFDataSourceJsonData, RMFDataSourceSecureJsonData } from '../common/types';
import { OMEGAMON_DS_TYPE_NAME } from '../common/configSettings';
import { getBackendSrv } from '@grafana/runtime';
Expand All @@ -41,7 +41,7 @@ interface State {
httpTimeoutError?: string;
basicAuthUserError?: string;
cacheSizeError?: string;
omegOptionsArray?: Array<ReactNode>;
omegOptionsArray?: SelectableValue<string>[];
}
// TODO: somehow prometheus can validate fields from "run and test" in v11
export default class ConfigEditor extends PureComponent<Props, State> {
Expand Down Expand Up @@ -158,6 +158,32 @@ export default class ConfigEditor extends PureComponent<Props, State> {
return optionsArray;
};

async componentDidMount() {
await this.updateDatasourceList(OMEGAMON_DS_TYPE_NAME);
}

updateDatasourceList = async (type: string) => {
var items: Set<string> = new Set();
var optionsArray: Array<SelectableValue<string>> = new Array;
items.add("");
optionsArray.push({label: "", value: "" } as SelectableValue);
if (this.props.options.jsonData?.omegamonDs && !items.has(this.props.options.jsonData?.omegamonDs)) {
items.add(this.props.options.jsonData?.omegamonDs);
optionsArray.push({label: this.props.options.jsonData?.omegamonDs, value: this.props.options.jsonData?.omegamonDs } as SelectableValue);
}
var datasources: any = await getBackendSrv().get("/api/datasources");
datasources.forEach((ds: any) => {
if (ds.type === type && !items.has(ds.name)) {
items.add(ds.name);
optionsArray.push({label: ds.name, value: ds.name } as SelectableValue);
}
});
this.setState((prevState) => ({
...prevState,
omegOptionsArray: optionsArray
}));
}

render() {
const { options } = this.props;
const { urlError, httpTimeoutError, basicAuthUserError, cacheSizeError } = this.state;
Expand Down Expand Up @@ -312,16 +338,15 @@ export default class ConfigEditor extends PureComponent<Props, State> {
</div>
</div>

<h3 className="page-heading">OMEGAMON (Experimental)</h3>
<h3 className="page-heading">OMEGAMON (optional)</h3>
<div className="gf-form-group">
<div className="gf-form">
<InlineField label="Data Source" labelWidth={INLINE_LABEL_WIDTH} tooltip="Linked OMEGAMON data source">
<Combobox
<Select
width={DATASOURCE_COMBO_WIDTH}
loading={true}
createCustomValue={true}
allowCustomValue={true}
value={options.jsonData?.omegamonDs}
options={this.loadDatasourceList}
options={this.state.omegOptionsArray}
onChange={(event) => {
this.updateSettings({ jsonData: { omegamonDs: String(event.value) } });
}}
Expand Down
Loading