Skip to content
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

Jump to bottom

OCPBUGS-13208: Fix PVC metrics query #12867

Merged
merged 1 commit into from Jun 16, 2023
Merged

OCPBUGS-13208: Fix PVC metrics query #12867

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions frontend/public/components/persistent-volume-claim.jsx
View file
Open in desktop
Expand Up @@ -88,11 +88,6 @@ export const PVCStatus = ({ pvc }) => {
);
};

const getQuery = (name) => {
const query = _.template('kubelet_volume_stats_used_bytes${name}');
return name ? query({ name: `{persistentvolumeclaim='${name}'}` }) : query();
};

const tableColumnClasses = [
'', // name
'', // namespace
Expand Down Expand Up @@ -165,7 +160,8 @@ const PVCTableRow = connect(mapStateToProps)(({ obj, metrics }) => {

const Details_ = ({ flags, obj: pvc }) => {
const canListPV = flags[FLAGS.CAN_LIST_PV];

const name = pvc?.metadata?.name;
const namespace = pvc?.metadata?.namespace;
const labelSelector = pvc?.spec?.selector;
const storageClassName = pvc?.spec?.storageClassName;
const volumeName = pvc?.spec?.volumeName;
Expand All @@ -174,11 +170,14 @@ const Details_ = ({ flags, obj: pvc }) => {
const accessModes = pvc?.status?.accessModes;
const volumeMode = pvc?.spec?.volumeMode;
const conditions = pvc?.status?.conditions;

const query =
name && namespace
? `kubelet_volume_stats_used_bytes{persistentvolumeclaim='${name}',namespace='${namespace}'}`
: '';
const [response, loadError, loading] = usePrometheusPoll({
endpoint: PrometheusEndpoint.QUERY,
namespace: pvc.metadata.namespace,
query: getQuery(pvc.metadata.name),
namespace,
query,
});

const totalCapacityMetric = convertToBaseValue(storage);
Expand Down Expand Up @@ -374,12 +373,11 @@ export const PersistentVolumeClaimsPage = (props) => {
const { t } = useTranslation();
const createPropExtensions = useExtensions(isPVCCreateProp);
const { namespace = undefined } = props;
const query = getQuery();
const dispatch = useDispatch();
const [response, loadError, loading] = usePrometheusPoll({
endpoint: PrometheusEndpoint.QUERY,
namespace,
query,
query: 'kubelet_volume_stats_used_bytes',
});
const pvcMetrics =
_.isEmpty(loadError) && !loading
Expand Down