Skip to content

2.2.0/dov/mark-259 #71

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

Open
n1654 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

2.2.0/dov/mark-259 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1040c5
k8s ms lib extended
abr-ubiqube Dec 15, 2020
a3e1f9e
Kubernetes web-UI tables refined
abr-ubiqube Jan 20, 2021
ca62e80
Merge branch 'master' into 2.2.0/dov/MARK-259
abr-ubiqube Jan 20, 2021
17cb676
uppercase for var names fixed
n1654 Jan 21, 2021
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
14 changes: 6 additions & 8 deletions KUBERNETES/Generic/.meta_Nodes.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,26 @@
<map>
<entry>
<key>DATE_MODIFICATION</key>
<value>1605535459377</value>
<value>1611163277610</value>
</entry>
<entry>
<key>REPOSITORY</key>
<value>CommandDefinition</value>
</entry>
<entry>
<key>DATE_CREATION</key>
<value>1605535459251</value>
<value>1611163277603</value>
</entry>
<entry>
<key>FILE_TYPE</key>
<value>text</value>
<key>MODEL</key>
<value>20060101</value>
</entry>
<entry>
<key>TAG</key>
<value>string</value>
</entry>
<entry>
<key>MODEL</key>
<value>20060101</value>
<key>FILE_TYPE</key>
<value>text</value>
</entry>
<entry>
<key>MANUFACTURER</key>
Expand All @@ -35,7 +34,6 @@
</entry>
<entry>
<key>COMMENT</key>
<value>string</value>
</entry>
</map>
</metadata>
4 changes: 2 additions & 2 deletions KUBERNETES/Generic/.meta_k8_pods_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<map>
<entry>
<key>DATE_MODIFICATION</key>
<value>1605543793138</value>
<value>1611163357226</value>
</entry>
<entry>
<key>REPOSITORY</key>
<value>CommandDefinition</value>
</entry>
<entry>
<key>DATE_CREATION</key>
<value>1605543793131</value>
<value>1611163357219</value>
</entry>
<entry>
<key>MODEL</key>
Expand Down
54 changes: 51 additions & 3 deletions KUBERNETES/Generic/Nodes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,15 @@
</information>
<variables frozen="0">
<variable displayName="object_id" name="params.object_id" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="0" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="node" name="params.node" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Node" name="params.node" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="OS Image" name="params.osImage" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Kernel Version" name="params.kernelVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="3" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Container Runtime Version" name="params.containerRuntimeVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Kubelet Version" name="params.kubeletVersion" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="5" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="CPU" name="params.cpu" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Ephemeral Storage" name="params.ephemeralStorage" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="7" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Memory" name="params.memory" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="8" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Pods" name="params.pods" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="9" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
</variables>
<example/>
<command name="IMPORT">
Expand All @@ -42,14 +50,54 @@
<regexp>@&lt;name&gt;(?&lt;node&gt;.*)&lt;/name&gt;@</regexp>
<xpath>//row/metadata/name</xpath>
</line>
<line>
<array/>
<regexp>@&lt;osImage&gt;(?&lt;osImage&gt;.*)&lt;/osImage&gt;@</regexp>
<xpath>//row/status/nodeInfo/osImage</xpath>
</line>
<line>
<array/>
<regexp>@&lt;kernelVersion&gt;(?&lt;kernelVersion&gt;.*)&lt;/kernelVersion&gt;@</regexp>
<xpath>//row/status/nodeInfo/kernelVersion</xpath>
</line>
<line>
<array/>
<regexp>@&lt;containerRuntimeVersion&gt;(?&lt;containerRuntimeVersion&gt;.*)&lt;/containerRuntimeVersion&gt;@</regexp>
<xpath>//row/status/nodeInfo/containerRuntimeVersion</xpath>
</line>
<line>
<array/>
<regexp>@&lt;kubeletVersion&gt;(?&lt;kubeletVersion&gt;.*)&lt;/kubeletVersion&gt;@</regexp>
<xpath>//row/status/nodeInfo/kubeletVersion</xpath>
</line>
<line>
<array/>
<regexp>@&lt;cpu&gt;(?&lt;cpu&gt;.*)&lt;/cpu&gt;@</regexp>
<xpath>//row/status/capacity/cpu</xpath>
</line>
<line>
<array/>
<regexp>@&lt;ephemeral-storage&gt;(?&lt;ephemeralStorage&gt;.*)&lt;/ephemeral-storage&gt;@</regexp>
<xpath>//row/status/capacity/ephemeral-storage</xpath>
</line>
<line>
<array/>
<regexp>@&lt;memory&gt;(?&lt;memory&gt;.*)&lt;/memory&gt;@</regexp>
<xpath>//row/status/capacity/memory</xpath>
</line>
<line>
<array/>
<regexp>@&lt;pods&gt;(?&lt;pods&gt;.*)&lt;/pods&gt;@</regexp>
<xpath>//row/status/capacity/pods</xpath>
</line>
</lines>
</parser>
<xpath>/api/v1/nodes/</xpath>
</command>
<command name="CREATE"/>
<command name="READ"/>
<command name="UPDATE"/>
<command name="CONSTRAINT"/>
<command name="CREATE"/>
<command name="DELETE"/>
<command name="READ"/>
<command name="LIST"/>
</ObjectDefinition>
30 changes: 15 additions & 15 deletions KUBERNETES/Generic/k8_pods_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<displayField>object_id</displayField>
<serviceTaskType/>
<order>10000</order>
<visibility>0</visibility>
<visibility>5</visibility>
<configType>xml</configType>
<createTemplateId/>
<createTemplateObject/>
Expand All @@ -26,41 +26,41 @@
</information>
<variables frozen="0">
<variable displayName="Name" name="params.object_id" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="0" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Creation Date" name="params.creation_date" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<variable displayName="Namespace" name="params.namespace" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
<variable displayName="Container Name" name="params.container_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<sections>
<sections>Pods</sections>
</sections>
</variable>
<variable displayName="App Name" name="params.app_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<variable displayName="Creation Date" name="params.creation_date" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<sections>
<sections>Pods</sections>
</sections>
<values>
<values displayValue="nginx">nginx</values>
<values displayValue="alpine">alpine</values>
<values displayValue="haproxy">haproxy</values>
<values displayValue="httpd">httpd</values>
<values displayValue="hello-world">hello-world</values>
<values displayValue="bash">bash</values>
<values displayValue="php">php</values>
</values>
</variable>
<variable displayName="Container Image" name="params.container_image" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="3" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<sections>
<sections>Pods</sections>
</sections>
</variable>
<variable displayName="Container Name" name="params.container_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<variable displayName="Container Status" name="params.container_status_phase" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<sections>
<sections>Pods</sections>
</sections>
</variable>
<variable displayName="Container Status" name="params.container_status_phase" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<variable displayName="App Name" name="params.app_name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
<sections>
<sections>Pods</sections>
</sections>
<values>
<values displayValue="nginx">nginx</values>
<values displayValue="alpine">alpine</values>
<values displayValue="haproxy">haproxy</values>
<values displayValue="httpd">httpd</values>
<values displayValue="hello-world">hello-world</values>
<values displayValue="bash">bash</values>
<values displayValue="php">php</values>
</values>
</variable>
<variable displayName="Namespace" name="params.namespace" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="6" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
</variables>
<example>
<content></content>
Expand Down