mirror of https://github.com/rancher/ui.git
Show events for pv and pvc
https://github.com/rancher/rancher/issues/15090
This commit is contained in:
parent
4688f13e49
commit
fc52b0f784
|
|
@ -145,6 +145,16 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{/accordion-list-item}}
|
{{/accordion-list-item}}
|
||||||
|
{{#if isView}}
|
||||||
|
{{resource-event-list
|
||||||
|
resourceType=(t 'generic.persistentVolumeClaim')
|
||||||
|
expandAll=al.expandAll
|
||||||
|
expandFn=expandFn
|
||||||
|
namespaceId=model.namespaceId
|
||||||
|
name=model.name
|
||||||
|
kind="PersistentVolumeClaim"
|
||||||
|
}}
|
||||||
|
{{/if}}
|
||||||
{{/accordion-list}}
|
{{/accordion-list}}
|
||||||
|
|
||||||
{{#unless isView}}
|
{{#unless isView}}
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,16 @@
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
{{/accordion-list-item}}
|
{{/accordion-list-item}}
|
||||||
|
|
||||||
|
{{#if isView}}
|
||||||
|
{{resource-event-list
|
||||||
|
resourceType=(t 'generic.persistentVolume')
|
||||||
|
expandAll=al.expandAll
|
||||||
|
expandFn=expandFn
|
||||||
|
name=model.name
|
||||||
|
kind="PersistentVolume"
|
||||||
|
}}
|
||||||
|
{{/if}}
|
||||||
{{/accordion-list}}
|
{{/accordion-list}}
|
||||||
|
|
||||||
{{#unless isView}}
|
{{#unless isView}}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@ import { inject as service } from '@ember/service';
|
||||||
import layout from './template';
|
import layout from './template';
|
||||||
import { set, get, observer } from '@ember/object';
|
import { set, get, observer } from '@ember/object';
|
||||||
|
|
||||||
|
const NON_NAMESPACED_RESOURCES = ['PersistentVolume'];
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend({
|
||||||
globalStore: service(),
|
globalStore: service(),
|
||||||
scope: service(),
|
scope: service(),
|
||||||
|
|
@ -65,8 +67,18 @@ export default Component.extend({
|
||||||
}),
|
}),
|
||||||
|
|
||||||
fetchEvents() {
|
fetchEvents() {
|
||||||
|
const query = `fieldSelector=involvedObject.name=${ get(this, 'name') },involvedObject.kind=${ get(this, 'kind').capitalize() }`;
|
||||||
|
|
||||||
|
let url = `/k8s/clusters/${ get(this, 'scope.currentCluster.id') }/api/v1/`;
|
||||||
|
|
||||||
|
if ( NON_NAMESPACED_RESOURCES.indexOf(get(this, 'kind')) === -1 ) {
|
||||||
|
url += `namespaces/${ get(this, 'namespaceId') }/`;
|
||||||
|
}
|
||||||
|
|
||||||
|
url += `events?${ query }`;
|
||||||
|
|
||||||
get(this, 'globalStore').rawRequest({
|
get(this, 'globalStore').rawRequest({
|
||||||
url: `/k8s/clusters/${ get(this, 'scope.currentCluster.id') }/api/v1/namespaces/${ get(this, 'namespaceId') }/events?fieldSelector=involvedObject.name=${ get(this, 'name') }`,
|
url,
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
})
|
})
|
||||||
.then((xhr) => {
|
.then((xhr) => {
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,7 @@
|
||||||
expandFn=expandFn
|
expandFn=expandFn
|
||||||
namespaceId=model.namespaceId
|
namespaceId=model.namespaceId
|
||||||
name=model.name
|
name=model.name
|
||||||
|
kind="Pod"
|
||||||
}}
|
}}
|
||||||
{{/accordion-list}}
|
{{/accordion-list}}
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@
|
||||||
expandFn=expandFn
|
expandFn=expandFn
|
||||||
namespaceId=service.namespaceId
|
namespaceId=service.namespaceId
|
||||||
name=service.name
|
name=service.name
|
||||||
|
kind=service.type
|
||||||
}}
|
}}
|
||||||
|
|
||||||
{{#if (or (eq service.type 'job') (eq service.type 'cronJob'))}}
|
{{#if (or (eq service.type 'job') (eq service.type 'cronJob'))}}
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,8 @@ generic:
|
||||||
ports: Ports
|
ports: Ports
|
||||||
prefix: prefix
|
prefix: prefix
|
||||||
project: Project
|
project: Project
|
||||||
|
persistentVolumeClaim: persistent volume claim
|
||||||
|
persistentVolume: persistent volume
|
||||||
random: Random
|
random: Random
|
||||||
remove: Remove
|
remove: Remove
|
||||||
role: Role
|
role: Role
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue