Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: bump @grafana/create-plugin configuration to 5.26.4 (#2082)

Browse Source 
Bumps
[`@grafana/create-plugin`](https://github.com/grafana/plugin-tools/tree/main/packages/create-plugin)
configuration from 4.2.1 to 5.26.4.

**Notes for reviewer:**
This is an auto-generated PR which ran `@grafana/create-plugin update`.
Please consult the create-plugin
[CHANGELOG.md](https://github.com/grafana/plugin-tools/blob/main/packages/create-plugin/CHANGELOG.md)
to understand what may have changed.
Please review the changes thoroughly before merging.

---------

Co-authored-by: grafana-plugins-platform-bot[bot] <144369747+grafana-plugins-platform-bot[bot]@users.noreply.github.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
This commit is contained in:
github-actions[bot]
2025-09-17 20:33:12 +02:00
committed by GitHub
parent e76741b453
commit b13d567eee
54 changed files with 15452 additions and 10339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/MetricPicker/MetricPicker.tsx
View File

@@ -13,7 +13,7 @@ export interface Props {
onChange: (value: string) => void;
}
export const MetricPicker = ({ value, options, isLoading, width, onChange }: Props): JSX.Element => {
export const MetricPicker = ({ value, options, isLoading, width, onChange }: Props) => {
const [isOpen, setOpen] = useState(false);
const [query, setQuery] = useState(value);
const [filteredOptions, setFilteredOptions] = useState(options);

2
src/components/MetricPicker/MetricPickerMenu.tsx
View File

@@ -12,7 +12,7 @@ interface Props {
selected?: number;
}
export const MetricPickerMenu = ({ options, offset, minWidth, selected, onSelect }: Props): JSX.Element => {
export const MetricPickerMenu = ({ options, offset, minWidth, selected, onSelect }: Props) => {
const theme = useTheme2();
const styles = getSelectStyles(theme);
const customStyles = useStyles2(getStyles(minWidth));

4
src/datasource/components/QueryEditor/QueryOptionsEditor.tsx
View File

@@ -1,5 +1,5 @@
import { css } from '@emotion/css';
import React, { useState, FormEvent } from 'react';
import React, { useState, FormEvent, ReactNode } from 'react';
import { GrafanaTheme2, SelectableValue } from '@grafana/data';
import {
HorizontalGroup,
@@ -71,7 +71,7 @@ export const QueryOptionsEditor = ({ queryType, queryOptions, onChange }: Props)
};
const renderOptions = () => {
const elements: JSX.Element[] = [];
const elements: ReactNode[] = [];
for (const key in queryOptions) {
if (queryOptions.hasOwnProperty(key)) {
const value = queryOptions[key];

8
src/datasource/problemsHandler.ts
View File

@@ -1,8 +1,8 @@
import { DataFrame, dateTime, Field, FieldType } from '@grafana/data';
import _ from 'lodash';
import * as utils from './utils';
import { DataFrame, Field, FieldType, ArrayVector, dateTime } from '@grafana/data';
import { ProblemDTO, ZBXEvent, ZBXProblem, ZBXTrigger } from './types';
import { ZabbixMetricsQuery } from './types/query';
import { ZBXProblem, ZBXTrigger, ProblemDTO, ZBXEvent } from './types';
import * as utils from './utils';
export function joinTriggersWithProblems(problems: ZBXProblem[], triggers: ZBXTrigger[]): ProblemDTO[] {
const problemDTOList: ProblemDTO[] = [];
@@ -210,7 +210,7 @@ export function toDataFrame(problems: any[], query: ZabbixMetricsQuery): DataFra
const problemsField: Field<any> = {
name: 'Problems',
type: FieldType.other,
values: new ArrayVector(problems),
values: problems,
config: {
custom: {
type: 'problems',

43
src/datasource/responseHandler.ts
View File

@@ -1,9 +1,4 @@
import _ from 'lodash';
import TableModel from 'grafana/app/core/table_model';
import * as c from './constants';
import * as utils from './utils';
import {
ArrayVector,
DataFrame,
dataFrameFromJSON,
DataFrameJSON,
@@ -16,8 +11,12 @@ import {
TIME_SERIES_TIME_FIELD_NAME,
TIME_SERIES_VALUE_FIELD_NAME,
} from '@grafana/data';
import { ZabbixMetricsQuery } from './types/query';
import TableModel from 'grafana/app/core/table_model';
import _ from 'lodash';
import * as c from './constants';
import { ZBXGroup, ZBXTrigger } from './types';
import { ZabbixMetricsQuery } from './types/query';
import * as utils from './utils';
/**
* Convert Zabbix API history.get response to Grafana format
@@ -113,14 +112,14 @@ export function seriesToDataFrame(
config: {
custom: {},
},
values: new ArrayVector<number>(datapoints.map((p) => p[c.DATAPOINT_TS])),
values: datapoints.map((p) => p[c.DATAPOINT_TS]),
};
let values: ArrayVector<number> | ArrayVector<string>;
let values: number[] | string[];
if (fieldType === FieldType.string) {
values = new ArrayVector<string>(datapoints.map((p) => p[c.DATAPOINT_VALUE]));
values = datapoints.map((p) => p[c.DATAPOINT_VALUE]);
} else {
values = new ArrayVector<number>(datapoints.map((p) => p[c.DATAPOINT_VALUE]));
values = datapoints.map((p) => p[c.DATAPOINT_VALUE]);
}
const valueFiled: Field = {
@@ -360,8 +359,8 @@ export function alignFrames(data: MutableDataFrame[]): MutableDataFrame[] {
timestamps = missingTimestamps.concat(timestamps);
values = missingValues.concat(values);
timeField.values = new ArrayVector(timestamps);
valueField.values = new ArrayVector(values);
timeField.values = timestamps;
valueField.values = values;
}
}
@@ -509,7 +508,7 @@ export function handleSLIResponse(response: any, itservices: any[], target: Zabb
config: {
custom: {},
},
values: new ArrayVector<number>(timestamps),
values: timestamps,
};
const valueFields: Field[] = [];
@@ -535,7 +534,7 @@ export function handleSLIResponse(response: any, itservices: any[], target: Zabb
name: service ? service.name : serviceId,
type: FieldType.number,
config: {},
values: new ArrayVector<number>(values[i]),
values: values[i],
});
}
@@ -568,7 +567,7 @@ export function handleMultiSLIResponse(response: any[], itservices: any[], slas:
config: {
custom: {},
},
values: new ArrayVector<number>(timestamps),
values: timestamps,
};
const valueFields: Field[] = [];
@@ -602,7 +601,7 @@ export function handleMultiSLIResponse(response: any[], itservices: any[], slas:
name,
type: FieldType.number,
config: {},
values: new ArrayVector<number>(values[i]),
values: values[i],
});
}
}
@@ -636,7 +635,7 @@ export function handleServiceResponse(response: any, itservices: any[], target:
name: service ? service.name : i,
type: FieldType.number,
config: {},
values: new ArrayVector<number>([status]),
values: [status],
});
}
@@ -646,7 +645,7 @@ export function handleServiceResponse(response: any, itservices: any[], target:
config: {
custom: {},
},
values: new ArrayVector<number>([Date.now()]),
values: [Date.now()],
};
return new MutableDataFrame({
@@ -694,8 +693,8 @@ function handleTriggersResponse(triggers: ZBXTrigger[], groups: ZBXGroup[], time
name: `Count ${target.refId}`,
refId: target.refId,
fields: [
{ name: TIME_SERIES_TIME_FIELD_NAME, type: FieldType.time, values: new ArrayVector([timeRange[1] * 1000]) },
{ name: TIME_SERIES_VALUE_FIELD_NAME, type: FieldType.number, values: new ArrayVector([triggersCount]) },
{ name: TIME_SERIES_TIME_FIELD_NAME, type: FieldType.time, values: [timeRange[1] * 1000] },
{ name: TIME_SERIES_VALUE_FIELD_NAME, type: FieldType.number, values: [triggersCount] },
],
length: 1,
});
@@ -706,7 +705,7 @@ function handleTriggersResponse(triggers: ZBXTrigger[], groups: ZBXGroup[], time
const frame = new MutableDataFrame({
name: `Triggers ${target.refId}`,
refId: target.refId,
fields: [{ name: 'Host group', type: FieldType.string, values: new ArrayVector() }],
fields: [{ name: 'Host group', type: FieldType.string, values: [] }],
});
for (let i = c.TRIGGER_SEVERITY.length - 1; i >= 0; i--) {
@@ -714,7 +713,7 @@ function handleTriggersResponse(triggers: ZBXTrigger[], groups: ZBXGroup[], time
name: c.TRIGGER_SEVERITY[i].text,
type: FieldType.number,
config: { unit: 'none', decimals: 0 },
values: new ArrayVector(),
values: [],
});
}

5
src/datasource/zabbix/connectors/influxdb/influxdbConnector.ts
View File

@@ -1,5 +1,4 @@
import {
ArrayVector,
DataFrame,
dataFrameToJSON,
Field,
@@ -142,14 +141,14 @@ function handleInfluxHistoryResponse(results) {
name: TIME_SERIES_TIME_FIELD_NAME,
type: FieldType.time,
config: {},
values: new ArrayVector(tsBuffer),
values: tsBuffer,
};
const valueFiled: Field<number | null> = {
name: influxSeries?.tags?.itemid,
type: FieldType.number,
config: {},
values: new ArrayVector(valuesBuffer),
values: valuesBuffer,
};
frames.push(

4
src/datasource/zabbix/connectors/sql/sqlConnector.ts
View File

@@ -117,8 +117,8 @@ export class SQLConnector extends DBConnector {
},
})
.then((response) => {
const results = response.data.results;
if (results['A']) {
const results = (response.data as { results?: any }).results;
if (results && results['A']) {
return results['A'].frames;
} else {
return null;

2
src/panel-triggers/ProblemsPanel.tsx
View File

@@ -15,7 +15,7 @@ const PROBLEM_EVENTS_LIMIT = 100;
interface ProblemsPanelProps extends PanelProps<ProblemsPanelOptions> {}
export const ProblemsPanel = (props: ProblemsPanelProps): JSX.Element => {
export const ProblemsPanel = (props: ProblemsPanelProps) => {
const { data, options, timeRange, onOptionsChange } = props;
const { layout, showTriggers, triggerSeverity, sortProblems } = options;

6
src/panel-triggers/components/ExecScriptModal.tsx
View File

@@ -1,4 +1,4 @@
import React, { PureComponent } from 'react';
import React, { PureComponent, ReactNode } from 'react';
import { css } from '@emotion/css';
import { GrafanaTheme, SelectableValue } from '@grafana/data';
import { Button, Spinner, Modal, Select, stylesFactory, withTheme, Themeable, ButtonGroup } from '@grafana/ui';
@@ -16,8 +16,8 @@ interface State {
scriptOptions: Array<SelectableValue<string>>;
script: ZBXScript;
error: boolean;
errorMessage: string | JSX.Element;
result: string | JSX.Element;
errorMessage: string | ReactNode;
result: string | ReactNode;
selectError: string;
loading: boolean;
}

4
src/panel-triggers/components/ProblemColorEditor.tsx
View File

@@ -5,7 +5,7 @@ import { TriggerSeverity } from '../types';
type Props = StandardEditorProps<TriggerSeverity[]>;
export const ProblemColorEditor = ({ value, onChange }: Props): JSX.Element => {
export const ProblemColorEditor = ({ value, onChange }: Props) => {
const onSeverityItemChange = (severity: TriggerSeverity) => {
value.forEach((v, i) => {
if (v.priority === severity.priority) {
@@ -33,7 +33,7 @@ interface ProblemColorEditorRowProps {
onChange: (value?: TriggerSeverity) => void;
}
export const ProblemColorEditorRow = ({ value, onChange }: ProblemColorEditorRowProps): JSX.Element => {
export const ProblemColorEditorRow = ({ value, onChange }: ProblemColorEditorRowProps) => {
const onSeverityNameChange = (v: FormEvent<HTMLInputElement>) => {
const newValue = v?.currentTarget?.value;
if (newValue !== null) {

5
src/plugin.json
View File

@@ -1,4 +1,5 @@
{
"$schema": "https://github.com/grafana/grafana/raw/main/docs/sources/developers/plugins/plugin.schema.json",
"type": "app",
"name": "Zabbix",
"id": "alexanderzobnin-zabbix-app",
@@ -65,8 +66,6 @@
}
],
"dependencies": {
"grafanaDependency": ">=10.4.8",
"grafanaVersion": "10.4",
"plugins": []
"grafanaDependency": ">=11.6.0"
}
}