diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml index fa4d6e53b..062ff431a 100755 --- a/datamodels/2.x/installation.xml +++ b/datamodels/2.x/installation.xml @@ -1,144 +1,172 @@ - - - Configuration Management options - The options below allow you to configure the type of elements that are to be managed inside iTop.]]> - /images/modules.png - - - Configuration Management Base - This module is always installed, it contains all the base objects that are mandatory in the iTop CMDB: Organizations, Locations, Teams, Persons, etc. - - itop-config-mgmt - itop-attachments - itop-profiles-itil - itop-welcome-itil - - true - - - - - Service Management options - Select the choice that best describes the relationships between the services and the IT infrastructure in your IT environment.]]> - ./wizard_icons/service.png - - - Service Management for Enterprises - Select this option if the IT delivers services based on a shared infrastructure. For example if different organizations within your company subscribe to services (like Mail and Print services) delivered by a single shared backend. - - itop-service-mgmt - - true - - - Service Management for Service Providers - Select this option if the IT manages the infrastructure of independent customers. This is the most flexible model, since the services can be delivered with a mix of shared and customer specific infrastructure devices. - - itop-service-mgmt-provider - - - - - - Tickets Management options - Select the type of tickets you want to use in order to respond to user requests and incidents. - - - - Simple Ticket Management - Select this option to use one single type of tickets for all kind of requests. - - itop-tickets - itop-request-mgmt - - true - - - ITIL Compliant Tickets Management - Select this option to have different types of ticket for managing user requests and incidents. Each type of ticket has a specific life cycle and specific fields - - itop-tickets - - - - - User Request Management - Manage User Request tickets in iTop - - itop-request-mgmt-itil - - - - Incident Management - Manage Incidents tickets in iTop - - itop-incident-mgmt-itil - - - - - - - None - Don't manage incidents in iTop - - - - - - - Change Management options - Select the type of tickets you want to use in order to manage changes to the IT infrastructure.]]> - ./itop-change-mgmt-1.0.0/images/change.png - - - Simple Change Management - Select this option to use one type of ticket for all kind of changes. - - itop-change-mgmt - - true - - - ITIL Change Management - Select this option to use Normal/Routine/Emergency change tickets. - - itop-change-mgmt-itil - - false - - - None - Don't manage changes in iTop - - - - - - - Additional ITIL tickets - Pick from the list below the additional ITIl processes that are to be implemented in iTop.]]> - ./itop-change-mgmt-1.0.0/images/change.png - - - Known Errors Management - Select this option to track "Known Errors" in iTop. - - itop-knownerror-mgmt - - false - - - Problem Management - Select this option track "Problems" in iTop. - - itop-problem-mgmt - - false - - - - + + + Configuration Management options + The options below allow you to configure the type of elements that are to be managed inside iTop.]]> + /images/modules.png + + + Configuration Management Base + This module is always installed, it contains all the base objects that are mandatory in the iTop CMDB: Organizations, Locations, Teams, Persons, etc. + + itop-config-mgmt + itop-attachments + itop-profiles-itil + itop-welcome-itil + + true + + + Data Center Devices + Manage Data Center devices such as racks, enclosures, etc. + + itop-datacenter-mgmt + + + + End-User Devices + Manage devices related to end-users: PCs, Phones, Tablets, etc. + + itop-endusers-devices + + + + Storage Devices + Manage storage devices such as NAS, SAN Switches, Tape Libraries and Tapes, Logical volumes, etc. + + itop-storage-mgmt + + + + Virtualization + Manage Hypervisors, Virtual Machines and Farms. + + itop-virtualization-mgmt + + + + + + Service Management options + Select the choice that best describes the relationships between the services and the IT infrastructure in your IT environment.]]> + ./wizard_icons/service.png + + + Service Management for Enterprises + Select this option if the IT delivers services based on a shared infrastructure. For example if different organizations within your company subscribe to services (like Mail and Print services) delivered by a single shared backend. + + itop-service-mgmt + + true + + + Service Management for Service Providers + Select this option if the IT manages the infrastructure of independent customers. This is the most flexible model, since the services can be delivered with a mix of shared and customer specific infrastructure devices. + + itop-service-mgmt-provider + + + + + + Tickets Management options + Select the type of tickets you want to use in order to respond to user requests and incidents. + + + + Simple Ticket Management + Select this option to use one single type of tickets for all kind of requests. + + itop-tickets + itop-request-mgmt + + true + + + ITIL Compliant Tickets Management + Select this option to have different types of ticket for managing user requests and incidents. Each type of ticket has a specific life cycle and specific fields + + itop-tickets + + + + + User Request Management + Manage User Request tickets in iTop + + itop-request-mgmt-itil + + + + Incident Management + Manage Incidents tickets in iTop + + itop-incident-mgmt-itil + + + + + + + None + Don't manage incidents in iTop + + + + + + + Change Management options + Select the type of tickets you want to use in order to manage changes to the IT infrastructure.]]> + ./itop-change-mgmt-1.0.0/images/change.png + + + Simple Change Management + Select this option to use one type of ticket for all kind of changes. + + itop-change-mgmt + + true + + + ITIL Change Management + Select this option to use Normal/Routine/Emergency change tickets. + + itop-change-mgmt-itil + + false + + + None + Don't manage changes in iTop + + + + + + + Additional ITIL tickets + Pick from the list below the additional ITIl processes that are to be implemented in iTop.]]> + ./itop-change-mgmt-1.0.0/images/change.png + + + Known Errors Management + Select this option to track "Known Errors" in iTop. + + itop-knownerror-mgmt + + false + + + Problem Management + Select this option track "Problems" in iTop. + + itop-problem-mgmt + + false + + + + diff --git a/datamodels/2.x/itop-config-mgmt/cis_menu.xml b/datamodels/2.x/itop-config-mgmt/cis_menu.xml deleted file mode 100755 index f98896b45..000000000 --- a/datamodels/2.x/itop-config-mgmt/cis_menu.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - DashboardLayoutOneCol - - - - 0 - - - 0 - Menu:ConfigManagement:AllDevices - itop-config-mgmt/images/server.png - Menu_ConfigManagement_AllDevices - - - 1 - Rack - - - 2 - Enclosure - - - 3 - Server - - - 4 - NetworkDevice - - - 5 - StorageSystem - - - 6 - SANSwitch - - - 7 - NAS - - - 8 - TapeLibrary - - - 9 - ElectricalConnection - - - - - 1 - - - 0 - Menu:ConfigManagement:virtualization - itop-config-mgmt/images/application.png - - - 1 - Farm - - - 2 - Hypervisor - - - 3 - VirtualMachine - - - - - 2 - - - 0 - Menu:ConfigManagement:EndUsers - itop-config-mgmt/images/team.png - - - 1 - PC - - - 2 - Phone - - - 3 - IpPhone - - - 4 - MobilePhone - - - 5 - Tablet - - - 6 - Printer - - - 7 - Peripheral - - - - - 3 - - - 0 - Menu:ConfigManagement:SWAndApps - itop-config-mgmt/images/application.png - - - 1 - Middleware - - - 2 - DBserver - - - 3 - Webserver - - - 4 - OtherSoftware - - - 5 - MiddlewareInstance - - - 6 - DatabaseSchema - - - 7 - WebApplication - - - 8 - Patch - - - 9 - Licence - - - - - 4 - - - 0 - Menu:ConfigManagement:Misc - itop-config-mgmt/images/subnet.png - - - 1 - NetworkInterface - - - 2 - Subnet - - - 3 - LogicalVolume - - - 4 - BusinessProcess - - - 5 - ApplicationSolution - - - 6 - Group - - - - - \ No newline at end of file diff --git a/datamodels/2.x/itop-config-mgmt/contacts_menu.xml b/datamodels/2.x/itop-config-mgmt/contacts_menu.xml deleted file mode 100755 index f2bce5716..000000000 --- a/datamodels/2.x/itop-config-mgmt/contacts_menu.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - DashboardLayoutOneCol - - - - 0 - - - 1 - Menu:Contact - itop-config-mgmt/images/team.png - Menu:Contact:Count - SELECT Contact - status - active,inactive - - - 2 - Team - - - 3 - Person - - - - - - diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index dc8696b07..fb4517380 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -1677,803 +1677,7 @@ - - PhysicalDevice - - bizmodel,searchable - false - autoincrement - telephonyci - id - - - %1$s - - - - - - images/mobile-phone.png - - - - - - - - - - - phonenumber - - true - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - -
-
- - TelephonyCI - - bizmodel,searchable - false - autoincrement - phone - id - - - %1$s - - - - - - images/phone.png - - - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - - 170 - - - 180 - - - 190 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - -
-
- - TelephonyCI - - bizmodel,searchable - false - autoincrement - mobilephone - id - - - %1$s - - - - - - images/mobile-phone.png - - - - - - - - - - - imei - - true - - - hw_pin - - true - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - - 170 - - - 180 - - - 190 - - - 200 - - - 210 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - -
-
- - TelephonyCI - - bizmodel,searchable - false - autoincrement - ipphone - id - - - %1$s - - - - - - images/ipphone.png - - - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - - 170 - - - 180 - - - 190 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - -
-
- - PhysicalDevice - - bizmodel,searchable - false - autoincrement - tablet - id - - - %1$s - - - - - - images/tablet.png - - - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - - 170 - - - 180 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
+ PhysicalDevice @@ -2514,6 +1718,7 @@ in_place 0 0 + in_place @@ -3552,1584 +2757,7 @@ - - DatacenterDevice - - bizmodel,searchable - false - autoincrement - storagesystem - id - - - %1$s - - - - - - images/storageArea.png - - - - - - - - - - - LogicalVolume - storagesystem_id - in_place - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT LogicalVolume WHERE storagesystem_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 120 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - DatacenterDevice - - bizmodel,searchable - false - autoincrement - sanswitch - id - - - %1$s - - - - - - images/switch.png - - - - - - - - - - - lnkSanToDatacenterDevice - san_id - 0 - 0 - datacenterdevice_id - - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT DatacenterDevice AS dc JOIN lnkSanToDatacenterDevice AS l1 ON l1.datacenterdevice_id = dc.id WHERE l1.san_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 110 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - DatacenterDevice - - bizmodel,searchable - false - autoincrement - tapelibrary - id - - - %1$s - - - - - - images/tapelibrary.png - - - - - - - - - - - Tape - tapelibrary_id - in_place - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT Tape WHERE tapelibrary_id= :this->id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 110 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - DatacenterDevice - - bizmodel,searchable - false - autoincrement - nas - id - - - %1$s - - - - - - images/nas.jpeg - - - - - - - - - - - NasFileSystem - nas_id - in_place - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT NasFileSystem WHERE nas_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 110 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - ConnectableCI - - bizmodel,searchable - false - autoincrement - pc - id - - - %1$s - - - - - - images/laptop.png - - - - - - - - - - - osfamily_id - OSfamily - true - DEL_MANUAL - - - osfamily_id - name - - - osfamily_id]]> - - - - osversion_id - OSversion - true - DEL_MANUAL - - - osversion_id - name - - - cpu - - true - - - ram - - true - - - - laptop - desktop - - type - - true - radio_horizontal - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - - - - - 90 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - ConnectableCI - - bizmodel,searchable - false - autoincrement - printer - id - - - %1$s - - - - - - images/printer.png - - - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 90 - - - 10 - - - 10 - - - 20 - - - 30 - - - - - 20 - - - 10 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
- - - PhysicalDevice - - bizmodel,searchable - false - autoincrement - peripheral - id - - - %1$s - - - - - - images/peripherals.png - - - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - - 150 - - - 160 - - - 170 - - - 180 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - -
-
FunctionalCI @@ -6740,1523 +4368,6 @@ - - FunctionalCI - - bizmodel,searchable - false - autoincrement - virtualdevice - id - - - %1$s - - - - - - images/application.png - - - - - - - - - - - - production - implementation - stock - obsolete - - status - production - true - list - - - lnkVirtualDeviceToVolume - virtualdevice_id - 0 - 0 - volume_id - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - -
-
- - VirtualDevice - - bizmodel,searchable - true - autoincrement - virtualhost - id - - - %1$s - - - - - - images/application.png - - - - - - - - - - - VirtualMachine - virtualhost_id - add_only - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT VirtualMachine WHERE virtualhost_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - case 'depends on': - $aRels = array( - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - -
-
- - VirtualHost - - bizmodel,searchable - false - autoincrement - hypervisor - id - - - %1$s - - - - - - images/hypervisor.png - - - - - - - - - - - farm_id - Farm - true - DEL_MANUAL - - - farm_id - name - - - server_id - Server - true - DEL_AUTO - - - server_id - name - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT Farm WHERE id = :this->farm_id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - case 'depends on': - $aRels = array( - "server" => array("sQuery"=>"SELECT Server WHERE id = :this->server_id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - - 140 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - -
-
- - VirtualHost - - bizmodel,searchable - false - autoincrement - farm - id - - - %1$s - - - - - - images/cluster.png - - - - - - - - - - - Hypervisor - farm_id - add_only - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT Hypervisor WHERE farm_id = :this->id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - 120 - - - 130 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - -
-
- - VirtualDevice - - bizmodel,searchable - false - autoincrement - virtualmachine - id - - - %1$s - - - - - - images/virtualmachine.png - - - - - - - - - - - virtualhost_id - VirtualHost - false - DEL_MANUAL - - - virtualhost_id - name - - - osfamily_id - OSfamily - true - DEL_MANUAL - - - osfamily_id - name - - - osfamily_id]]> - - - - osversion_id - OSversion - true - DEL_MANUAL - - - osversion_id - name - - - osversion_id]]> - - - - oslicence_id - OsLicence - true - DEL_MANUAL - - - oslicence_id - name - - - cpu - - true - - - ram - - true - - - LogicalInterface - virtualmachine_id - in_place - 0 - 0 - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT VirtualHost WHERE id = :this->virtualhost_id", "bPropagate"=>true, "iDistance"=>10), - - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - 20 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 100 - - - 10 - - - 10 - - - 20 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - -
-
- - cmdbAbstractObject - - bizmodel,searchable,configmgmt - false - autoincrement - logicalvolume - id - - - %1$s - - - - - - - images/volume.png - - - - - - - - - - - - name - - false - - - lun_id - - false - - - description - - true - - - raid_level - - true - - - size - - true - - - storagesystem_id - StorageSystem - false - DEL_AUTO - - - storagesystem_id - name - - - lnkServerToVolume - volume_id - 0 - 0 - server_id - - - - lnkVirtualDeviceToVolume - volume_id - 0 - 0 - virtualdevice_id - - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT Server AS s JOIN lnkServerToVolume AS l1 ON l1.server_id=s.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5), - "virtualdevice" => array("sQuery"=>"SELECT VirtualDevice AS vd JOIN lnkVirtualDeviceToVolume AS l1 ON l1.virtualdevice_id=vd.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - case 'depends on': - $aRels = array( - "sotragesystem" => array("sQuery"=>"SELECT StorageStystem AS storage WHERE storage.id = :this->storagesystem_id", "bPropagate"=>true, "iDistance"=>5), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - -
-
- - cmdbAbstractObject - - bizmodel,configmgmt - false - autoincrement - lnkservertovolume - id - - - %1$s - - - - - - - - - - - - - - - - volume_id - LogicalVolume - false - DEL_AUTO - - - volume_id - name - - - server_id - Server - false - DEL_AUTO - - - server_id - name - - - size_used - - true - - - - -
- - - 10 - - - 20 - - - 30 - - -
- - - - 10 - - - 20 - - - - - - - 10 - - - 20 - - - 30 - - - -
-
- - cmdbAbstractObject - - bizmodel,configmgmt - false - autoincrement - lnkvirtualdevicetovolume - id - - - %1$s - - - - - - - - - - - - - - - - volume_id - LogicalVolume - false - DEL_AUTO - - - volume_id - name - - - virtualdevice_id - VirtualDevice - false - DEL_AUTO - - - virtualdevice_id - name - - - size_used - - true - - - - -
- - - 10 - - - 20 - - - 30 - - -
- - - - 10 - - - 20 - - - - - - - 10 - - - 20 - - - 30 - - - -
-
- - cmdbAbstractObject - - 1 - bizmodel,configmgmt - false - autoincrement - lnkdatacenterdevicetosan - id - - - %1$s - - - - - - - - - - - - - - - - san_id - SANSwitch - false - DEL_AUTO - - - san_id - name - - - datacenterdevice_id - DatacenterDevice - false - DEL_AUTO - - - datacenterdevice_id - name - - - san_port - - true - - - datacenterdevice_port - - true - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - -
-
- - cmdbAbstractObject - - bizmodel,searchable,configmgmt - false - autoincrement - tape - id - - - %1$s - - - - - - images/tape.png - - - - - - - - - - name - - false - - - description - - true - - - size - - true - - - tapelibrary_id - TapeLibrary - false - DEL_AUTO - - - tapelibrary_id - name - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT TapeLibrary WHERE id = :this->tapelibrary_id", "bPropagate"=>true, "iDistance"=>5), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - -
- - - - 10 - - - 20 - - - - - - - 10 - - - 20 - - - -
-
- - cmdbAbstractObject - - bizmodel,searchable,configmgmt - false - autoincrement - nasfilesystem - id - - - %1$s - - - - - - images/filesystem.png - - - - - - - - - - name - - false - - - description - - true - - - raid_level - - true - - - size - - true - - - nas_id - NAS - false - DEL_AUTO - - - nas_id - name - - - - - true - public - Overload-DBObject - array("sQuery"=>"SELECT NAS WHERE id = :this->nas_id", "bPropagate"=>true, "iDistance"=>5), - ); - return array_merge($aRels, parent::GetRelationQueries($sRelCode)); - break; - - default: - return parent::GetRelationQueries($sRelCode); - } - }]]> - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - -
-
cmdbAbstractObject @@ -10772,113 +6883,6 @@ - - NetworkInterface - - bizmodel,searchable - false - autoincrement - fiberchannelinterface - id - - - %1$s %2$s - - - - - - - images/application.png - - - - - - - - - - - speed - - true - 6 - 2 - - - topology - - true - - - wwn - - true - - - datacenterdevice_id - DatacenterDevice - false - DEL_AUTO - - - datacenterdevice_id - name - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - -
-
cmdbAbstractObject @@ -11737,82 +7741,6 @@ 4 NetworkDevice - - 5 - StorageSystem - - - 6 - SANSwitch - - - 7 - NAS - - - 8 - TapeLibrary - - - - - 1 - - - 0 - Menu:ConfigManagement:virtualization - itop-config-mgmt/images/application.png - - - 1 - Farm - - - 2 - Hypervisor - - - 3 - VirtualMachine - - - - - 2 - - - 0 - Menu:ConfigManagement:EndUsers - itop-config-mgmt/images/team.png - - - 1 - PC - - - 2 - Phone - - - 3 - IpPhone - - - 4 - MobilePhone - - - 5 - Tablet - - - 6 - Printer - - - 7 - Peripheral - @@ -11877,10 +7805,6 @@ 2 Subnet - - 3 - LogicalVolume - 4 BusinessProcess @@ -11901,7 +7825,34 @@ 2 ConfigManagement - contacts_menu.xml + + DashboardLayoutOneCol + + + + 0 + + + 1 + Menu:Contact + itop-config-mgmt/images/team.png + Menu:Contact:Count + SELECT Contact + status + active,inactive + + + 2 + Team + + + 3 + Person + + + + + 3 diff --git a/datamodels/2.x/itop-config-mgmt/images/cluster.png b/datamodels/2.x/itop-config-mgmt/images/cluster.png deleted file mode 100755 index f487814b4..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/cluster.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/enclosure.png b/datamodels/2.x/itop-config-mgmt/images/enclosure.png deleted file mode 100755 index e92ca2bee..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/enclosure.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/filesystem.png b/datamodels/2.x/itop-config-mgmt/images/filesystem.png deleted file mode 100755 index 74b78dbc1..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/filesystem.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/hypervisor.png b/datamodels/2.x/itop-config-mgmt/images/hypervisor.png deleted file mode 100755 index 7f4fbf8cc..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/hypervisor.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/powersource.png b/datamodels/2.x/itop-config-mgmt/images/powersource.png deleted file mode 100755 index 0bcae204d..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/powersource.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/powerstart.png b/datamodels/2.x/itop-config-mgmt/images/powerstart.png deleted file mode 100755 index 733b645ae..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/powerstart.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/rack.png b/datamodels/2.x/itop-config-mgmt/images/rack.png deleted file mode 100755 index 8d55ca7d3..000000000 Binary files a/datamodels/2.x/itop-config-mgmt/images/rack.png and /dev/null differ diff --git a/datamodels/2.x/itop-config-mgmt/images/server.png b/datamodels/2.x/itop-config-mgmt/images/server.png index b21caca7e..f72c54213 100755 Binary files a/datamodels/2.x/itop-config-mgmt/images/server.png and b/datamodels/2.x/itop-config-mgmt/images/server.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/switch.png b/datamodels/2.x/itop-config-mgmt/images/switch.png index 4067d555e..5d8c49354 100755 Binary files a/datamodels/2.x/itop-config-mgmt/images/switch.png and b/datamodels/2.x/itop-config-mgmt/images/switch.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/webserver.png b/datamodels/2.x/itop-config-mgmt/images/webserver.png index 46fd521cf..f9df5f434 100755 Binary files a/datamodels/2.x/itop-config-mgmt/images/webserver.png and b/datamodels/2.x/itop-config-mgmt/images/webserver.png differ diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php index 03745f664..8250417de 100755 --- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php @@ -37,12 +37,8 @@ SetupWebPage::AddModule( 'data.sample.persons.xml', 'data.sample.teams.xml', 'data.sample.contactteam.xml', - 'data.sample.racks.xml', 'data.sample.servers.xml', 'data.sample.nw-devices.xml', - 'data.sample.farm.xml', - 'data.sample.hypervisor.xml', - 'data.sample.vm.xml', 'data.sample.software.xml', 'data.sample.dbserver.xml', 'data.sample.dbschema.xml', diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.racks.xml b/datamodels/2.x/itop-datacenter-mgmt/data.sample.racks.xml similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.racks.xml rename to datamodels/2.x/itop-datacenter-mgmt/data.sample.racks.xml diff --git a/datamodels/2.x/itop-datacenter-mgmt/images/rack.png b/datamodels/2.x/itop-datacenter-mgmt/images/rack.png index 8d55ca7d3..8210d8805 100755 Binary files a/datamodels/2.x/itop-datacenter-mgmt/images/rack.png and b/datamodels/2.x/itop-datacenter-mgmt/images/rack.png differ diff --git a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php index 43b1451f7..3ba7e6088 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php +++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php @@ -47,6 +47,7 @@ SetupWebPage::AddModule( ), 'data.sample' => array( // add your sample data XML files here, + 'data.sample.racks.xml', ), // Documentation diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml new file mode 100644 index 000000000..83a90cd9e --- /dev/null +++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml @@ -0,0 +1,1443 @@ + + + + + PhysicalDevice + + bizmodel,searchable + false + autoincrement + telephonyci + id + + + %1$s + + + + + + images/mobile-phone.png + + + + + + + + + + + phonenumber + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + +
+
+ + TelephonyCI + + bizmodel,searchable + false + autoincrement + phone + id + + + %1$s + + + + + + images/phone.png + + + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + + 170 + + + 180 + + + 190 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + +
+
+ + TelephonyCI + + bizmodel,searchable + false + autoincrement + mobilephone + id + + + %1$s + + + + + + images/mobile-phone.png + + + + + + + + + + + imei + + true + + + hw_pin + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + + 170 + + + 180 + + + 190 + + + 200 + + + 210 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + +
+
+ + TelephonyCI + + bizmodel,searchable + false + autoincrement + ipphone + id + + + %1$s + + + + + + images/ipphone.png + + + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + + 170 + + + 180 + + + 190 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + +
+
+ + PhysicalDevice + + bizmodel,searchable + false + autoincrement + tablet + id + + + %1$s + + + + + + images/tablet.png + + + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + + 170 + + + 180 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + ConnectableCI + + bizmodel,searchable + false + autoincrement + pc + id + + + %1$s + + + + + + images/laptop.png + + + + + + + + + + + osfamily_id + OSfamily + true + DEL_MANUAL + + + osfamily_id + name + + + osfamily_id]]> + + + + osversion_id + OSversion + true + DEL_MANUAL + + + osversion_id + name + + + cpu + + true + + + ram + + true + + + + laptop + desktop + + type + + true + radio_horizontal + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + + + + + 90 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + ConnectableCI + + bizmodel,searchable + false + autoincrement + printer + id + + + %1$s + + + + + + images/printer.png + + + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 90 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + + PhysicalDevice + + bizmodel,searchable + false + autoincrement + peripheral + id + + + %1$s + + + + + + images/peripherals.png + + + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + 150 + + + 160 + + + 170 + + + 180 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+
+ + + + + + 2 + + + 0 + Menu:ConfigManagement:EndUsers + itop-config-mgmt/images/team.png + + + 1 + PC + + + 2 + Phone + + + 3 + IpPhone + + + 4 + MobilePhone + + + 5 + Tablet + + + 6 + Printer + + + 7 + Peripheral + + + + + + + +
\ No newline at end of file diff --git a/datamodels/2.x/itop-endusers-devices/en.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/en.dict.itop-endusers-devices.php new file mode 100644 index 000000000..c98b93a15 --- /dev/null +++ b/datamodels/2.x/itop-endusers-devices/en.dict.itop-endusers-devices.php @@ -0,0 +1,29 @@ + + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + +Dict::Add('EN US', 'English', 'English', array( + // Dictionary entries go here +)); +?> diff --git a/datamodels/2.x/itop-config-mgmt/images/ipphone.png b/datamodels/2.x/itop-endusers-devices/images/ipphone.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/ipphone.png rename to datamodels/2.x/itop-endusers-devices/images/ipphone.png diff --git a/datamodels/2.x/itop-config-mgmt/images/laptop.png b/datamodels/2.x/itop-endusers-devices/images/laptop.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/laptop.png rename to datamodels/2.x/itop-endusers-devices/images/laptop.png diff --git a/datamodels/2.x/itop-config-mgmt/images/mobile-phone.png b/datamodels/2.x/itop-endusers-devices/images/mobile-phone.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/mobile-phone.png rename to datamodels/2.x/itop-endusers-devices/images/mobile-phone.png diff --git a/datamodels/2.x/itop-config-mgmt/images/peripherals.png b/datamodels/2.x/itop-endusers-devices/images/peripherals.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/peripherals.png rename to datamodels/2.x/itop-endusers-devices/images/peripherals.png diff --git a/datamodels/2.x/itop-config-mgmt/images/phone.png b/datamodels/2.x/itop-endusers-devices/images/phone.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/phone.png rename to datamodels/2.x/itop-endusers-devices/images/phone.png diff --git a/datamodels/2.x/itop-endusers-devices/images/printer.png b/datamodels/2.x/itop-endusers-devices/images/printer.png new file mode 100755 index 000000000..24bcb9678 Binary files /dev/null and b/datamodels/2.x/itop-endusers-devices/images/printer.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/tablet.png b/datamodels/2.x/itop-endusers-devices/images/tablet.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/tablet.png rename to datamodels/2.x/itop-endusers-devices/images/tablet.png diff --git a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php new file mode 100644 index 000000000..82b38a2e3 --- /dev/null +++ b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php @@ -0,0 +1,63 @@ + 'End User Devices management', + 'category' => 'business', + + // Setup + // + 'dependencies' => array( + 'itop-config-mgmt/2.0.0' + ), + 'mandatory' => false, + 'visible' => true, + + // Components + // + 'datamodel' => array( + 'model.itop-endusers-devices.php' + ), + 'webservice' => array( + + ), + 'data.struct' => array( + // add your 'structure' definition XML files here, + ), + 'data.sample' => array( + // add your sample data XML files here, + ), + + // Documentation + // + 'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any + 'doc.more_information' => '', // hyperlink to more information, if any + + // Default settings + // + 'settings' => array( + // Module specific settings go here, if any + ), + ) +); + + +?> diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 3825ba075..1c454f6e7 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -2222,6 +2222,32 @@ + + + + + 1 + + + 0 + Menu:RequestManagement + itop-welcome-itil/images/user-request-deadline.png + Open Requests + SELECT UserRequest WHERE status != "closed" + status + new,assigned,escalated_tto,escalated_ttr,resolved + + + 1 + UI:WelcomeMenu:MyCalls + SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved") + true + + + + + + 30 Contact diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index ebfeb39a1..a23de341e 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -2204,6 +2204,32 @@ + + + + + 1 + + + 0 + Menu:RequestManagement + itop-welcome-itil/images/user-request-deadline.png + Open Requests + SELECT UserRequest WHERE status != "closed" + status + new,assigned,escalated_tto,escalated_ttr,resolved + + + 1 + UI:WelcomeMenu:MyCalls + SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved") + true + + + + + + 30 Contact diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml new file mode 100644 index 000000000..555009239 --- /dev/null +++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml @@ -0,0 +1,1855 @@ + + + + + DatacenterDevice + + bizmodel,searchable + false + autoincrement + storagesystem + id + + + %1$s + + + + + + images/storageArea.png + + + + + + + + + + + LogicalVolume + storagesystem_id + in_place + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT LogicalVolume WHERE storagesystem_id = :this->id", "bPropagate"=>true, "iDistance"=>10), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 120 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + DatacenterDevice + + bizmodel,searchable + false + autoincrement + sanswitch + id + + + %1$s + + + + + + images/switch.png + + + + + + + + + + + lnkSanToDatacenterDevice + san_id + 0 + 0 + datacenterdevice_id + + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT DatacenterDevice AS dc JOIN lnkSanToDatacenterDevice AS l1 ON l1.datacenterdevice_id = dc.id WHERE l1.san_id = :this->id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 110 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + DatacenterDevice + + bizmodel,searchable + false + autoincrement + tapelibrary + id + + + %1$s + + + + + + images/tapelibrary.png + + + + + + + + + + + Tape + tapelibrary_id + in_place + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT Tape WHERE tapelibrary_id= :this->id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 110 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + DatacenterDevice + + bizmodel,searchable + false + autoincrement + nas + id + + + %1$s + + + + + + images/nas.jpeg + + + + + + + + + + + NasFileSystem + nas_id + in_place + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT NasFileSystem WHERE nas_id = :this->id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 110 + + + 10 + + + 10 + + + 20 + + + 30 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + +
+
+ + cmdbAbstractObject + + bizmodel,searchable,configmgmt + false + autoincrement + tape + id + + + %1$s + + + + + + images/tape.png + + + + + + + + + + name + + false + + + description + + true + + + size + + true + + + tapelibrary_id + TapeLibrary + false + DEL_AUTO + + + tapelibrary_id + name + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT TapeLibrary WHERE id = :this->tapelibrary_id", "bPropagate"=>true, "iDistance"=>5), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + +
+ + + + 10 + + + 20 + + + + + + + 10 + + + 20 + + + +
+
+ + cmdbAbstractObject + + bizmodel,searchable,configmgmt + false + autoincrement + nasfilesystem + id + + + %1$s + + + + + + images/filesystem.png + + + + + + + + + + name + + false + + + description + + true + + + raid_level + + true + + + size + + true + + + nas_id + NAS + false + DEL_AUTO + + + nas_id + name + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT NAS WHERE id = :this->nas_id", "bPropagate"=>true, "iDistance"=>5), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + +
+
+ + NetworkInterface + + bizmodel,searchable + false + autoincrement + fiberchannelinterface + id + + + %1$s %2$s + + + + + + + images/application.png + + + + + + + + + + + speed + + true + 6 + 2 + + + topology + + true + + + wwn + + true + + + datacenterdevice_id + DatacenterDevice + false + DEL_AUTO + + + datacenterdevice_id + name + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + +
+
+ + cmdbAbstractObject + + bizmodel,searchable,configmgmt + false + autoincrement + logicalvolume + id + + + %1$s + + + + + + + images/volume.png + + + + + + + + + + + + name + + false + + + lun_id + + false + + + description + + true + + + raid_level + + true + + + size + + true + + + storagesystem_id + StorageSystem + false + DEL_AUTO + + + storagesystem_id + name + + + lnkServerToVolume + volume_id + 0 + 0 + server_id + + + + lnkVirtualDeviceToVolume + volume_id + 0 + 0 + virtualdevice_id + + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT Server AS s JOIN lnkServerToVolume AS l1 ON l1.server_id=s.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5), + "virtualdevice" => array("sQuery"=>"SELECT VirtualDevice AS vd JOIN lnkVirtualDeviceToVolume AS l1 ON l1.virtualdevice_id=vd.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + case 'depends on': + $aRels = array( + "sotragesystem" => array("sQuery"=>"SELECT StorageStystem AS storage WHERE storage.id = :this->storagesystem_id", "bPropagate"=>true, "iDistance"=>5), + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + +
+
+ + cmdbAbstractObject + + bizmodel,configmgmt + false + autoincrement + lnkservertovolume + id + + + %1$s + + + + + + + + + + + + + + + + volume_id + LogicalVolume + false + DEL_AUTO + + + volume_id + name + + + server_id + Server + false + DEL_AUTO + + + server_id + name + + + size_used + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + +
+ + + + 10 + + + 20 + + + + + + + 10 + + + 20 + + + 30 + + + +
+
+ + cmdbAbstractObject + + bizmodel,configmgmt + false + autoincrement + lnkvirtualdevicetovolume + id + + + %1$s + + + + + + + + + + + + + + + + volume_id + LogicalVolume + false + DEL_AUTO + + + volume_id + name + + + virtualdevice_id + VirtualDevice + false + DEL_AUTO + + + virtualdevice_id + name + + + size_used + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + +
+ + + + 10 + + + 20 + + + + + + + 10 + + + 20 + + + 30 + + + +
+
+ + cmdbAbstractObject + + 1 + bizmodel,configmgmt + false + autoincrement + lnkdatacenterdevicetosan + id + + + %1$s + + + + + + + + + + + + + + + + san_id + SANSwitch + false + DEL_AUTO + + + san_id + name + + + datacenterdevice_id + DatacenterDevice + false + DEL_AUTO + + + datacenterdevice_id + name + + + san_port + + true + + + datacenterdevice_port + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + +
+
+
+ + + 1 + ConfigManagement + + DashboardLayoutOneCol + + + + 0 + + + 5 + StorageSystem + + + 6 + SANSwitch + + + 7 + NAS + + + 8 + TapeLibrary + + + + + 4 + + + 3 + LogicalVolume + + + + + + + + +
\ No newline at end of file diff --git a/datamodels/2.x/itop-storage-mgmt/en.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/en.dict.itop-storage-mgmt.php new file mode 100644 index 000000000..c98b93a15 --- /dev/null +++ b/datamodels/2.x/itop-storage-mgmt/en.dict.itop-storage-mgmt.php @@ -0,0 +1,29 @@ + + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + +Dict::Add('EN US', 'English', 'English', array( + // Dictionary entries go here +)); +?> diff --git a/datamodels/2.x/itop-storage-mgmt/images/diskarray.png b/datamodels/2.x/itop-storage-mgmt/images/diskarray.png new file mode 100755 index 000000000..ae6e1d8d7 Binary files /dev/null and b/datamodels/2.x/itop-storage-mgmt/images/diskarray.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/nas.jpeg b/datamodels/2.x/itop-storage-mgmt/images/nas.jpeg similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/nas.jpeg rename to datamodels/2.x/itop-storage-mgmt/images/nas.jpeg diff --git a/datamodels/2.x/itop-config-mgmt/images/storageArea.png b/datamodels/2.x/itop-storage-mgmt/images/storageArea.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/storageArea.png rename to datamodels/2.x/itop-storage-mgmt/images/storageArea.png diff --git a/datamodels/2.x/itop-config-mgmt/images/pdu.png b/datamodels/2.x/itop-storage-mgmt/images/switch.png similarity index 50% rename from datamodels/2.x/itop-config-mgmt/images/pdu.png rename to datamodels/2.x/itop-storage-mgmt/images/switch.png index c3255bc4e..5d8c49354 100755 Binary files a/datamodels/2.x/itop-config-mgmt/images/pdu.png and b/datamodels/2.x/itop-storage-mgmt/images/switch.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/tape.png b/datamodels/2.x/itop-storage-mgmt/images/tape.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/tape.png rename to datamodels/2.x/itop-storage-mgmt/images/tape.png diff --git a/datamodels/2.x/itop-config-mgmt/images/tapelibrary.png b/datamodels/2.x/itop-storage-mgmt/images/tapelibrary.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/tapelibrary.png rename to datamodels/2.x/itop-storage-mgmt/images/tapelibrary.png diff --git a/datamodels/2.x/itop-storage-mgmt/images/volume.png b/datamodels/2.x/itop-storage-mgmt/images/volume.png new file mode 100755 index 000000000..cc3540912 Binary files /dev/null and b/datamodels/2.x/itop-storage-mgmt/images/volume.png differ diff --git a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php new file mode 100644 index 000000000..e949594d9 --- /dev/null +++ b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php @@ -0,0 +1,63 @@ + 'Advanced Storage Management', + 'category' => 'business', + + // Setup + // + 'dependencies' => array( + 'itop-config-mgmt/2.0.0' + ), + 'mandatory' => false, + 'visible' => true, + + // Components + // + 'datamodel' => array( + 'model.itop-storage-mgmt.php' + ), + 'webservice' => array( + + ), + 'data.struct' => array( + // add your 'structure' definition XML files here, + ), + 'data.sample' => array( + // add your sample data XML files here, + ), + + // Documentation + // + 'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any + 'doc.more_information' => '', // hyperlink to more information, if any + + // Default settings + // + 'settings' => array( + // Module specific settings go here, if any + ), + ) +); + + +?> diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.farm.xml b/datamodels/2.x/itop-virtualization-mgmt/data.sample.farm.xml similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.farm.xml rename to datamodels/2.x/itop-virtualization-mgmt/data.sample.farm.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.hypervisor.xml b/datamodels/2.x/itop-virtualization-mgmt/data.sample.hypervisor.xml similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.hypervisor.xml rename to datamodels/2.x/itop-virtualization-mgmt/data.sample.hypervisor.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.vm.xml b/datamodels/2.x/itop-virtualization-mgmt/data.sample.vm.xml similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.vm.xml rename to datamodels/2.x/itop-virtualization-mgmt/data.sample.vm.xml diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml new file mode 100644 index 000000000..7f7dd3da6 --- /dev/null +++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml @@ -0,0 +1,835 @@ + + + + + FunctionalCI + + bizmodel,searchable + false + autoincrement + virtualdevice + id + + + %1$s + + + + + + images/application.png + + + + + + + + + + + + production + implementation + stock + obsolete + + status + production + true + list + + + lnkVirtualDeviceToVolume + virtualdevice_id + 0 + 0 + volume_id + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + +
+
+ + VirtualDevice + + bizmodel,searchable + true + autoincrement + virtualhost + id + + + %1$s + + + + + + images/application.png + + + + + + + + + + + VirtualMachine + virtualhost_id + add_only + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT VirtualMachine WHERE virtualhost_id = :this->id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + case 'depends on': + $aRels = array( + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + +
+
+ + VirtualHost + + bizmodel,searchable + false + autoincrement + hypervisor + id + + + %1$s + + + + + + images/hypervisor.png + + + + + + + + + + + farm_id + Farm + true + DEL_MANUAL + + + farm_id + name + + + server_id + Server + true + DEL_AUTO + + + server_id + name + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT Farm WHERE id = :this->farm_id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + case 'depends on': + $aRels = array( + "server" => array("sQuery"=>"SELECT Server WHERE id = :this->server_id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + + 140 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + +
+
+ + VirtualHost + + bizmodel,searchable + false + autoincrement + farm + id + + + %1$s + + + + + + images/cluster.png + + + + + + + + + + + Hypervisor + farm_id + add_only + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT Hypervisor WHERE farm_id = :this->id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + 120 + + + 130 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + +
+
+ + VirtualDevice + + bizmodel,searchable + false + autoincrement + virtualmachine + id + + + %1$s + + + + + + images/virtualmachine.png + + + + + + + + + + + virtualhost_id + VirtualHost + false + DEL_MANUAL + + + virtualhost_id + name + + + osfamily_id + OSfamily + true + DEL_MANUAL + + + osfamily_id + name + + + osfamily_id]]> + + + + osversion_id + OSversion + true + DEL_MANUAL + + + osversion_id + name + + + osversion_id]]> + + + + oslicence_id + OsLicence + true + DEL_MANUAL + + + oslicence_id + name + + + cpu + + true + + + ram + + true + + + LogicalInterface + virtualmachine_id + in_place + 0 + 0 + + + + + true + public + Overload-DBObject + array("sQuery"=>"SELECT VirtualHost WHERE id = :this->virtualhost_id", "bPropagate"=>true, "iDistance"=>10), + + ); + return array_merge($aRels, parent::GetRelationQueries($sRelCode)); + break; + + default: + return parent::GetRelationQueries($sRelCode); + } + }]]> + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + 20 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 100 + + + 10 + + + 10 + + + 20 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + +
+
+
+ + + + + + 1 + + + 0 + Menu:ConfigManagement:virtualization + itop-virtualization-mgmt/images/hypervisor-sw.png + + + 1 + Farm + + + 2 + Hypervisor + + + 3 + VirtualMachine + + + + + + + +
diff --git a/datamodels/2.x/itop-virtualization-mgmt/en.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/en.dict.itop-virtualization-mgmt.php new file mode 100644 index 000000000..c98b93a15 --- /dev/null +++ b/datamodels/2.x/itop-virtualization-mgmt/en.dict.itop-virtualization-mgmt.php @@ -0,0 +1,29 @@ + + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + +Dict::Add('EN US', 'English', 'English', array( + // Dictionary entries go here +)); +?> diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png b/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png new file mode 100755 index 000000000..3cff90813 Binary files /dev/null and b/datamodels/2.x/itop-virtualization-mgmt/images/cluster.png differ diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png new file mode 100755 index 000000000..a3fabd3c7 Binary files /dev/null and b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor-sw.png differ diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png new file mode 100755 index 000000000..ea0a0b7e8 Binary files /dev/null and b/datamodels/2.x/itop-virtualization-mgmt/images/hypervisor.png differ diff --git a/datamodels/2.x/itop-config-mgmt/images/virtualmachine.png b/datamodels/2.x/itop-virtualization-mgmt/images/virtualmachine.png similarity index 100% rename from datamodels/2.x/itop-config-mgmt/images/virtualmachine.png rename to datamodels/2.x/itop-virtualization-mgmt/images/virtualmachine.png diff --git a/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png b/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png new file mode 100755 index 000000000..f690b2f5d Binary files /dev/null and b/datamodels/2.x/itop-virtualization-mgmt/images/vlan.png differ diff --git a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php new file mode 100644 index 000000000..0a0afc972 --- /dev/null +++ b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php @@ -0,0 +1,66 @@ + 'Virtualization Management', + 'category' => 'business', + + // Setup + // + 'dependencies' => array( + 'itop-config-mgmt/2.0.0' + ), + 'mandatory' => false, + 'visible' => true, + + // Components + // + 'datamodel' => array( + 'model.itop-virtualization-mgmt.php' + ), + 'webservice' => array( + + ), + 'data.struct' => array( + // add your 'structure' definition XML files here, + ), + 'data.sample' => array( + // add your sample data XML files here, + 'data.sample.farm.xml', + 'data.sample.hypervisor.xml', + 'data.sample.vm.xml', + ), + + // Documentation + // + 'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any + 'doc.more_information' => '', // hyperlink to more information, if any + + // Default settings + // + 'settings' => array( + // Module specific settings go here, if any + ), + ) +); + + +?> diff --git a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php index bf8b25a1b..34de8240c 100755 --- a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php +++ b/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php @@ -44,8 +44,8 @@ class ItopWelcome extends ModuleHandlerAPI { public static function OnMenuCreation() { - $oWelcomeMenu = new MenuGroup('WelcomeMenu', 10 /* fRank */); - new DashboardMenuNode('WelcomeMenuPage', dirname(__FILE__).'/welcome_menu.xml', $oWelcomeMenu->GetIndex() /* oParent */, 1 /* fRank */); + //$oWelcomeMenu = new MenuGroup('WelcomeMenu', 10 /* fRank */); + //new DashboardMenuNode('WelcomeMenuPage', dirname(__FILE__).'/welcome_menu.xml', $oWelcomeMenu->GetIndex() /* oParent */, 1 /* fRank */); $oToolsMenu = new MenuGroup('DataAdministration', 70 /* fRank */, 'Organization', UR_ACTION_MODIFY, UR_ALLOWED_YES|UR_ALLOWED_DEPENDS); new WebPageMenuNode('CSVImportMenu', utils::GetAbsoluteUrlAppRoot().'pages/csvimport.php', $oToolsMenu->GetIndex(), 1 /* fRank */); diff --git a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php index 85833d90c..3ed1a12c3 100755 --- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php +++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php @@ -22,6 +22,7 @@ SetupWebPage::AddModule( // 'datamodel' => array( 'main.itop-welcome-itil.php', + 'model.itop-welcome-itil.php', ), 'webservice' => array( //'webservices.itop-welcome-itil.php', diff --git a/datamodels/2.x/itop-welcome-itil/welcome_menu.xml b/datamodels/2.x/itop-welcome-itil/welcome_menu.xml deleted file mode 100755 index 984cb6804..000000000 --- a/datamodels/2.x/itop-welcome-itil/welcome_menu.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - DashboardLayoutOneCol - - - - 0 - - - 0 - Menu:ConfigManagementCI - itop-welcome-itil/images/database.png - - - 1 - BusinessProcess - - - 2 - ApplicationSolution - - - 3 - Contact - - - 4 - Location - - - 5 - Contract - - - 6 - Server - - - 7 - NetworkDevice - - - - - 1 - - - 0 - Menu:RequestManagement - itop-welcome-itil/images/user-request-deadline.png - Open Requests - SELECT UserRequest WHERE status != "closed" - status - new,assigned,escalated_tto,escalated_ttr,resolved - - - 1 - UI:WelcomeMenu:MyCalls - SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved") - true - - - - -