Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 51e85f4c authored by POUILLOUX Laurent's avatar POUILLOUX Laurent
Browse files

Merge branch 'sophia_network2' into 'master' 

Sophia network2

See merge request !955
parents 50839723 eb7d2785
Branches
No related tags found
1 merge request!955Sophia network2
Pipeline #1102266 passed with warnings
Stage: .pre
Stage: deploy-to-api-servers
Stage: check
Stage: generate-access-history
Stage: deploy
Stage: .post
Pipeline: Resources Explorer

#1102269

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 189 additions and 124 deletions
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/34",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/33",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/13",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/14",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/36",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/35",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/11",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -131,8 +131,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": null,
    "switch_port": null,
    "switch": "sw-3",
    "switch_port": "1/1/12",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/31",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/32",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/33",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/34",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/35",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -168,8 +168,8 @@
    "rate": 25000000000,
    "sriov": false,
    "sriov_totalvfs": 0,
    "switch": null,
    "switch_port": null,
    "switch": "sw-1",
    "switch_port": "1/1/36",
    "vendor": "Broadcom Inc. and subsidiaries"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -156,8 +156,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": "gw",
    "switch_port": "GigabitEthernet9/3",
    "switch": "sw-3",
    "switch_port": "1/1/45",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -156,8 +156,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": "gw",
    "switch_port": "GigabitEthernet4/9",
    "switch": "sw-3",
    "switch_port": "1/1/1",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -156,8 +156,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": "gw",
    "switch_port": "GigabitEthernet4/1",
    "switch": "sw-3",
    "switch_port": "1/1/2",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
    + 2
    − 2
    View file @ 51e85f4c
    ......@@ -156,8 +156,8 @@
    "rate": 1000000000,
    "sriov": true,
    "sriov_totalvfs": 7,
    "switch": "gw",
    "switch_port": "GigabitEthernet9/1",
    "switch": "sw-3",
    "switch_port": "1/1/46",
    "vendor": "Intel"
    },
    {
    ......
    data/grid5000/sites/sophia/clusters/uvb/uvb.json
    + 0
    − 88
    View file @ 51e85f4c
    ......@@ -48,94 +48,6 @@
    "port": 9100,
    "protocol": "prometheus"
    }
    },
    {
    "description": "Input byte counter for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifacein_bytes_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Output byte counter for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifaceout_bytes_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Input packet counter for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifacein_packets_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Output packet counter for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifaceout_packets_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Input counter of discarded packets for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifacein_packets_discard_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Output counter of discarded packets for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifaceout_packets_discard_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Input counter of packet errors for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifacein_packets_error_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    },
    {
    "description": "Output counter of packet errors for the network device port",
    "labels": {
    "interface": "eth0"
    },
    "name": "network_ifaceout_packets_error_total",
    "period": 1000,
    "source": {
    "protocol": "network_equipment"
    }
    }
    ],
    "model": "Dell PowerEdge C6100",
    ......
    data/grid5000/sites/sophia/network_equipments/swy1nef.json → data/grid5000/sites/sophia/network_equipments/gw-ng.json
    + 153
    − 0
    View file @ 51e85f4c
    {
    "backplane_bps": 184000000000,
    "ip": "172.16.143.249",
    "channels": {
    "lag1": {
    "kind": "server",
    "port": "lag1",
    "rate": 500000000000,
    "uid": "srv-data1"
    },
    "lag2": {
    "kind": "server",
    "port": "lag2",
    "rate": 500000000000,
    "uid": "srv-data2"
    },
    "lag3": {
    "kind": "server",
    "port": "lag3",
    "rate": 500000000000,
    "uid": "srv-data3"
    },
    "lag4": {
    "kind": "server",
    "port": "lag4",
    "rate": 200000000000,
    "uid": "srv-data4"
    }
    },
    "ip": "172.17.143.253",
    "kind": "switch",
    "linecards": [
    {
    "kavlan_pattern": "%PORT%",
    },
    {
    "kavlan_pattern": "%LINECARD%/1/%PORT%",
    "kind": "node",
    "ports": [
    {
    ......@@ -102,133 +129,25 @@
    {
    },
    {
    "kind": "switch",
    "snmp_name": "1/1/47",
    "uid": "sw-3"
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    },
    {
    "kind": "switch",
    "port": "0/18",
    "snmp_name": "Port: 103 Gigabit",
    "uid": "swx1nef"
    "kind": "router",
    "snmp_name": "1/1/48",
    "uid": "gw"
    }
    ],
    "rate": 1000000000,
    "snmp_pattern": "Port: %PORT% Gigabit"
    "snmp_pattern": "%LINECARD%/1/%PORT%"
    }
    ],
    "managed_by_us": true,
    "model": "Dell PowerConnect 6248",
    "model": "Aruba 6300M",
    "site": "sophia",
    "snmp_community": "g5kadmin",
    "snmp_community": "public",
    "type": "network_equipment",
    "uid": "swy1nef",
    "warranty": "expired"
    "uid": "gw-ng",
    "warranty": "2048-05"
    }
    \ No newline at end of file
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment