--- a/includes/definitions/mibs/fscom.inc.php
+++ b/includes/definitions/mibs/fscom.inc.php
@@ -137,7 +137,7 @@
   'table'               => 'fsSystemMultipleTemperatureTable',
   'oid'                 => 'fsSystemMultipleTemperatureCurrent',
   'class'               => 'temperature',
-  'descr'               => '%fsSystemMultipleTemperatureName% (Slot %fsSystemMultipleTemperatureSlotIndex%)',
+  'descr'               => 'Unit %fsSystemMultipleTemperatureDeviceIndex% Slot %fsSystemMultipleTemperatureSlotIndex% Temperature %fsSystemMultipleTemperatureIndex%',
   'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.1.1.44.1.5',
   'scale'               => 1,
   'oid_limit_high'      => 'fsSystemMultipleTemperatureCritical',
@@ -161,15 +161,16 @@
   'table'               => 'fsSystemFanStatusTable',
   'oid'                 => 'fsSystemFanStatusSpeed',
   'class'               => 'fanspeed',
-  'descr'               => 'Fan %fsSystemFanStatusFanIndex% (#%fsSystemFanStatusIndex%)',
+  'descr'               => 'Unit %fsSystemFanStatusDeviceIndex% Fan %fsSystemFanStatusFanIndex%',
   'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.1.1.43.1.6',
-  'scale'               => 1
+  'scale'               => 1,
+  'min'                 => 0, // S3410 (FSOS 11.x) always reports 0 rpm, fan status only
 ];
 
 $config['mibs'][$mib]['status'][] = [
   'table'               => 'fsSystemFanStatusTable',
   'oid'                 => 'fsSystemFanStatus',
-  'descr'               => 'Fan %fsSystemFanStatusFanIndex% (#%fsSystemFanStatusIndex%)',
+  'descr'               => 'Unit %fsSystemFanStatusDeviceIndex% Fan %fsSystemFanStatusFanIndex%',
   'type'                => 'fsSystemStatus',
   'measured'            => 'fan',
   'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.1.1.43.1.4',
@@ -178,7 +179,7 @@
 $config['mibs'][$mib]['status'][] = [
   'table'               => 'fsSystemElectricalInformationTable',
   'oid'                 => 'fsSystemElectricalInformationStatus',
-  'descr'               => 'Power Supply %fsSystemElectricalInformationIndex% (%fsSystemElectricalInformationType%)',
+  'descr'               => 'Unit %fsSystemElectricalInformationDeviceIndex% Power Supply %fsSystemElectricalInformationIndex% (%fsSystemElectricalInformationType%, %fsSystemElectricalInformationRatedPower%W)',
   'type'                => 'fsSystemStatus',
   'measured'            => 'powersupply',
   'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.1.1.41.1.3',
@@ -192,6 +193,103 @@
 $config['mibs'][$mib]['states'][$type][5] = [ 'name' => 'powerbutabnormal', 'event' => 'alert' ];
 $config['mibs'][$mib]['states'][$type][6] = [ 'name' => 'unknow',           'event' => 'exclude' ];
 
+$mib = 'FS-POE-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.52642.1.1.10.2.110';
+$config['mibs'][$mib]['mib_dir'] = 'fscom';
+$config['mibs'][$mib]['descr'] = 'FS PoE (per port power, per unit PSE).';
+
+// Per port power and statuses are discovered in includes/discovery/sensors/fs-poe-mib.inc.php
+$type = 'pethMainPseOperStatus';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'on',     'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'off',    'event' => 'ignore' ];
+$config['mibs'][$mib]['states'][$type][3] = [ 'name' => 'faulty', 'event' => 'alert' ];
+
+// FSOS NG returns 0 (not in enum) for ports with nothing connected
+$type = 'pethPsePortDetectionStatus';
+$config['mibs'][$mib]['states'][$type][0] = [ 'name' => 'off',             'event' => 'ignore' ];
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'disabled',        'event' => 'ignore' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'searching',       'event' => 'ignore' ];
+$config['mibs'][$mib]['states'][$type][3] = [ 'name' => 'deliveringPower', 'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][4] = [ 'name' => 'fault',           'event' => 'warning' ];
+$config['mibs'][$mib]['states'][$type][5] = [ 'name' => 'test',            'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][6] = [ 'name' => 'otherFault',      'event' => 'warning' ];
+
+$type = 'ifPoePwrStatus';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'on',  'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'off', 'event' => 'ignore' ];
+
+$mib = 'FS-VSU-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.52642.1.1.10.2.102';
+$config['mibs'][$mib]['mib_dir'] = 'fscom';
+$config['mibs'][$mib]['descr'] = 'FS VSU (stacking) members and VSL links.';
+
+// FS-VSU-MIB::fsVsuTopoShape.0 = INTEGER: ring(2)
+// FS-VSU-MIB::fsVsuTopoConn.0 = STRING: [1](1/2)---(2/1)[2](2/2)---(3/1)[3](3/2)---(1/1)[1]
+// FS-VSU-MIB::fsVsuDeviceStatus.1 = INTEGER: ok(1)
+// FS-VSU-MIB::fsVsuDeviceRole.1 = INTEGER: candidate(3)
+// FS-VSU-MIB::fsVsuVslPortIfIndex.49 = INTEGER: 49
+// FS-VSU-MIB::fsVsuVslApIf.49 = STRING: VSL-AP-1/1
+// FS-VSU-MIB::fsVsuVslPortState.49 = INTEGER: ok(3)
+// FS-VSU-MIB::fsVsuVslPortPeerIfIndex.49 = INTEGER: 150
+$config['mibs'][$mib]['status'][] = [
+  'oid'                 => 'fsVsuTopoShape',
+  'descr'               => 'Stack Topology',
+  'type'                => 'fsVsuTopoShape',
+  'measured'            => 'device',
+  'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.102.1.1.1',
+  'test'                => [ 'oid' => 'fsVsuDeviceID.2', 'operator' => 'ge', 'value' => 1 ], // only real stacks (2+ members)
+];
+
+$config['mibs'][$mib]['status'][] = [
+  'oid'                 => 'fsVsuDeviceStatus',
+  'descr'               => 'Stack Unit %index%',
+  'type'                => 'fsVsuDeviceStatus',
+  'measured'            => 'device',
+  'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.102.1.2.2.1.5',
+];
+
+$config['mibs'][$mib]['status'][] = [
+  'oid'                 => 'fsVsuDeviceRole',
+  'descr'               => 'Stack Unit %index% Role',
+  'type'                => 'fsVsuDeviceRole',
+  'measured'            => 'device',
+  'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.102.1.2.2.1.6',
+];
+
+$config['mibs'][$mib]['status'][] = [
+  'oid'                 => 'fsVsuVslPortState',
+  'descr'               => '%port_label% Stack Link %fsVsuVslApIf%',
+  'oid_extra'           => [ 'fsVsuVslApIf' ],
+  'type'                => 'fsVsuVslPortState',
+  'measured'            => 'port',
+  'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
+  'oid_num'             => '.1.3.6.1.4.1.52642.1.1.10.2.102.1.3.1.1.3',
+];
+
+// chain = one VSL link of a ring is broken (or stack cabled as chain)
+$type = 'fsVsuTopoShape';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'chain', 'event' => 'warning' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'ring',  'event' => 'ok' ];
+
+$type = 'fsVsuDeviceStatus';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'ok',       'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'recovery', 'event' => 'alert' ];
+
+// Informational, role changes are logged in eventlog
+$type = 'fsVsuDeviceRole';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'active',    'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'standby',   'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][3] = [ 'name' => 'candidate', 'event' => 'ok' ];
+
+$type = 'fsVsuVslPortState';
+$config['mibs'][$mib]['states'][$type][1] = [ 'name' => 'down',    'event' => 'alert' ];
+$config['mibs'][$mib]['states'][$type][2] = [ 'name' => 'up',      'event' => 'warning' ];
+$config['mibs'][$mib]['states'][$type][3] = [ 'name' => 'ok',      'event' => 'ok' ];
+$config['mibs'][$mib]['states'][$type][4] = [ 'name' => 'disable', 'event' => 'ignore' ];
+$config['mibs'][$mib]['states'][$type][5] = [ 'name' => 'aged',    'event' => 'warning' ];
+
 $mib = 'FS-PROCESS-MIB';
 $config['mibs'][$mib]['enable'] = 1;
 $config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.52642.1.1.10.2.36';
--- a/includes/definitions/mibs/fscom/fs-fiber-mib.inc.php
+++ b/includes/definitions/mibs/fscom/fs-fiber-mib.inc.php
@@ -113,7 +113,7 @@
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberTemp',
     'descr'               => '%port_label% Temperature (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberTempStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberTempStatus' ],
     'class'               => 'temperature',
     'scale'               => 1,
     //'min'                 => 0,
@@ -124,13 +124,14 @@
     //'oid_limit_low'       => 'hwOpticsTemperatureLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberTempStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberVoltage',
     'descr'               => '%port_label% Voltage (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberVoltageStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberVoltageStatus' ],
     'class'               => 'voltage',
     'scale'               => 0.001,
     //'min'                 => 0,
@@ -141,13 +142,14 @@
     //'oid_limit_low'       => 'hwOpticsVoltageLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberVoltageStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberBias',
     'descr'               => '%port_label% TX Bias (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberBiasStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberBiasStatus' ],
     'class'               => 'current',
     'scale'               => 0.000001,
     //'min'                 => 0,
@@ -158,6 +160,7 @@
     //'oid_limit_low'       => 'hwOpticsCurrentLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberBiasStatus ne unknown' ]
 ];
 
@@ -166,7 +169,7 @@
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel1Bias',
     'descr'               => '%port_label% Lane 1 TX Bias (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel1BiasStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel1BiasStatus' ],
     'class'               => 'current',
     'scale'               => 0.000001,
     //'min'                 => 0,
@@ -177,13 +180,14 @@
     //'oid_limit_low'       => 'hwOpticsCurrentLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel1BiasStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel2Bias',
     'descr'               => '%port_label% Lane 2 TX Bias (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel2BiasStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel2BiasStatus' ],
     'class'               => 'current',
     'scale'               => 0.000001,
     //'min'                 => 0,
@@ -194,13 +198,14 @@
     //'oid_limit_low'       => 'hwOpticsCurrentLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel2BiasStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel3Bias',
     'descr'               => '%port_label% Lane 3 TX Bias (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel3BiasStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel3BiasStatus' ],
     'class'               => 'current',
     'scale'               => 0.000001,
     //'min'                 => 0,
@@ -211,13 +216,14 @@
     //'oid_limit_low'       => 'hwOpticsCurrentLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel3BiasStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel4Bias',
     'descr'               => '%port_label% Lane 4 TX Bias (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel4BiasStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel4BiasStatus' ],
     'class'               => 'current',
     'scale'               => 0.000001,
     //'min'                 => 0,
@@ -228,13 +234,14 @@
     //'oid_limit_low'       => 'hwOpticsCurrentLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel4BiasStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberRXpowerInteger',
     'descr'               => '%port_label% RX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberRXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberRXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -245,6 +252,7 @@
     //'oid_limit_low'       => 'hwOpticsPowerTxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberRXpowerStatus ne unknown' ]
 ];
 
@@ -252,7 +260,7 @@
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel1RXpowerInteger',
     'descr'               => '%port_label% Lane 1 RX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel1RXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel1RXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -263,13 +271,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerTxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel1RXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel2RXpowerInteger',
     'descr'               => '%port_label% Lane 2 RX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel2RXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel2RXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -280,13 +289,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerTxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel2RXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel3RXpowerInteger',
     'descr'               => '%port_label% Lane 3 RX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel3RXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel3RXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -297,13 +307,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerTxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel3RXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel4RXpowerInteger',
     'descr'               => '%port_label% Lane 4 RX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel4RXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel4RXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -314,13 +325,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerTxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel4RXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberTXpowerInteger',
     'descr'               => '%port_label% TX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberTXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberTXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -331,6 +343,7 @@
     //'oid_limit_low'       => 'hwOpticsPowerRxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberTXpowerStatus ne unknown' ]
 ];
 
@@ -338,7 +351,7 @@
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel1TXpowerInteger',
     'descr'               => '%port_label% Lane 1 TX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel1TXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel1TXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -349,13 +362,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerRxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel1TXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel2TXpowerInteger',
     'descr'               => '%port_label% Lane 2 TX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel2TXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel2TXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -366,13 +380,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerRxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel2TXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel3TXpowerInteger',
     'descr'               => '%port_label% Lane 3 TX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel3TXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel3TXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -383,13 +398,14 @@
     //'oid_limit_low'       => 'hwOpticsPowerRxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel3TXpowerStatus ne unknown' ]
 ];
 
 $config['mibs'][$mib]['sensor'][] = [
     'oid'                 => 'fsFiberChannel4TXpowerInteger',
     'descr'               => '%port_label% Lane 4 TX Power (%fsFiberVendorName%, %fsFiberVendorPN%, %fsFiberSerialNumber%)',
-    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberDDMSupportStatus', 'fsFiberChannel4TXpowerStatus' ],
+    'oid_extra'           => [ 'fsFiberVendorName', 'fsFiberVendorPN', 'fsFiberSerialNumber', 'fsFiberTransceiverType', 'fsFiberDDMSupportStatus', 'fsFiberChannel4TXpowerStatus' ],
     'class'               => 'dbm',
     'scale'               => 0.01,
     'invalid'             => -10000,
@@ -400,6 +416,7 @@
     //'oid_limit_low'       => 'hwOpticsPowerRxLowerThresholdValue',
     'measured_match'      => [ 'entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ],
     'test'                => [ 'field: fsFiberDDMSupportStatus ne false',
+                               'field: fsFiberTransceiverType notmatch *Copper*', // DAC cables (stack links) report garbage DDM
                                'field: fsFiberChannel4TXpowerStatus ne unknown' ]
 ];
 
--- a/includes/definitions/os/fscom.inc.php
+++ b/includes/definitions/os/fscom.inc.php
@@ -94,6 +94,13 @@
 $config['os'][$os]['vendor']                = "fs.com";
 $config['os'][$os]['modules']['ports_separate_walk'] = 1; // Force use separate ports polling feature
 $config['os'][$os]['sysObjectID'][]         = '.1.3.6.1.4.1.52642.1.1';
+// FSOS NG's LLDP-MIB/LLDP-EXT-MED-MIB agent occasionally returns a
+// non-increasing OID mid-walk (seen on S3410-48TS-P with a large LLDP
+// neighbor table), which makes net-snmp defensively abort the whole
+// snmpbulkwalk ("OID not increasing", eventlog WARNINGs on every affected
+// column). -Cc (noincrease) tells it to tolerate that and keep walking,
+// same fix the warning message itself suggests.
+$config['os'][$os]['snmp']['noincrease']    = TRUE;
 // $config['os'][$os]['discovery'][]           = [
 //   'sysObjectID'                             => '.1.3.6.1.4.1.52642.1.1',
 //   'sysDescr'                                => '/FS/',
@@ -126,6 +133,8 @@
 $config['os'][$os]['mibs'][]                = "FS-MEMORY-MIB";
 $config['os'][$os]['mibs'][]                = "FS-FLASH-MIB";
 $config['os'][$os]['mibs'][]                = "FS-FIBER-MIB";
+$config['os'][$os]['mibs'][]                = "FS-POE-MIB";             // PoE per port/unit, see discovery/sensors/fs-poe-mib.inc.php
+$config['os'][$os]['mibs'][]                = "FS-VSU-MIB";             // Stack members and VSL links
 
 $os = "fsios";
 $config['os'][$os]['text']                  = "FS IOS";
--- /dev/null
+++ b/includes/discovery/sensors/fs-poe-mib.inc.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @copyright  (C) Adam Armstrong
+ *
+ */
+
+// FS (FSOS NG, S3410 etc) PoE.
+//
+// FS-POE-MIB port table is indexed by ifIndex (per port power in mW).
+// POWER-ETHERNET-MIB port table uses group = unit * 100, port = port number:
+//   pethPsePortDetectionStatus.200.5 -> GigabitEthernet 2/0/5 (ifIndex 55 on a 50 port unit)
+// while pethMainPseTable is indexed by unit (1, 2, 3).
+// Generic POWER-ETHERNET-MIB discovery can't associate these ports, so it is not used for fsos-ng.
+
+////// PoE PSE per stack unit
+
+// pethMainPsePower.1 = Gauge32: 740 Watts
+// pethMainPseOperStatus.1 = INTEGER: on(1)
+// pethMainPseConsumptionPower.1 = Gauge32: 41 Watts
+// pethMainPseUsageThreshold.1 = INTEGER: 90 %
+$oids = snmpwalk_cache_oid($device, 'pethMainPseTable', [], 'POWER-ETHERNET-MIB');
+
+foreach ($oids as $unit => $entry) {
+    $descr = "Unit $unit PoE";
+
+    if (isset($entry['pethMainPseOperStatus'])) {
+        discover_status_ng($device, $mib, 'pethMainPseOperStatus', ".1.3.6.1.2.1.105.1.3.1.1.3.$unit", $unit, 'pethMainPseOperStatus', $descr, $entry['pethMainPseOperStatus'], [ 'entPhysicalClass' => 'power' ]);
+    }
+
+    if (is_numeric($entry['pethMainPseConsumptionPower'])) {
+        $options = [];
+        if ($entry['pethMainPsePower'] > 0) {
+            $warn = $entry['pethMainPseUsageThreshold'] > 0 && $entry['pethMainPseUsageThreshold'] < 100 ? $entry['pethMainPseUsageThreshold'] / 100 : 0.9;
+            $options['limit_high']      = $entry['pethMainPsePower'];
+            $options['limit_high_warn'] = $entry['pethMainPsePower'] * $warn;
+        }
+        discover_sensor_ng($device, 'power', $mib, 'pethMainPseConsumptionPower', ".1.3.6.1.2.1.105.1.3.1.1.4.$unit", $unit, $descr, 1, $entry['pethMainPseConsumptionPower'], $options);
+    }
+}
+
+////// PoE ports
+
+// FS-POE-MIB::ifIsPoe.4 = INTEGER: true(1)
+// FS-POE-MIB::ifPoeEnable.4 = INTEGER: enabled(1)
+// FS-POE-MIB::ifPoePwrStatus.4 = INTEGER: on(1)
+// FS-POE-MIB::ifPoeMaxPwrSet.4 = INTEGER: 2147483647 (not set)
+// FS-POE-MIB::ifPoeConsumingPwr.4 = INTEGER: 2500 (mW)
+$oids = snmpwalk_cache_oid($device, 'ifIsPoe', [], $mib);
+if (!snmp_status()) {
+    return;
+}
+foreach ([ 'ifPoeEnable', 'ifPoePwrStatus', 'ifPoeMaxPwrSet', 'ifPoeConsumingPwr' ] as $oid) {
+    $oids = snmpwalk_cache_oid($device, $oid, $oids, $mib);
+}
+// 0 (not in enum) for ports where nothing is connected
+$peth = snmpwalk_cache_oid($device, 'pethPsePortDetectionStatus', [], 'POWER-ETHERNET-MIB');
+
+$oid_power  = snmp_translate('ifPoeConsumingPwr', $mib);
+$oid_status = snmp_translate('ifPoePwrStatus', $mib);
+foreach ($oids as $ifIndex => $entry) {
+    if ($entry['ifIsPoe'] !== 'true' || $entry['ifPoeEnable'] === 'disabled') {
+        continue;
+    }
+
+    $port    = get_port_by_ifIndex($device['device_id'], $ifIndex);
+    $options = $port ? [ 'measured_class' => 'port', 'measured_entity' => $port['port_id'] ] : [];
+    $label   = $port ? $port['port_label'] : "ifIndex $ifIndex";
+
+    // Power, mW
+    // Without a configured port max, use fixed limits instead of auto ones (value * 1.5 alerted on 1.5W devices):
+    // alert above 802.3af class 0 (15.4W), warn above 12W.
+    $options_power = $options;
+    if ($entry['ifPoeMaxPwrSet'] > 0 && $entry['ifPoeMaxPwrSet'] < 2147483647) {
+        $options_power['limit_high']      = $entry['ifPoeMaxPwrSet'] * 0.001;
+        $options_power['limit_high_warn'] = $entry['ifPoeMaxPwrSet'] * 0.001 * 0.9;
+    } else {
+        $options_power['limit_high']      = 15.4;
+        $options_power['limit_high_warn'] = 12;
+    }
+    discover_sensor_ng($device, 'power', $mib, 'ifPoeConsumingPwr', "$oid_power.$ifIndex", $ifIndex, "$label PoE Power", 0.001, $entry['ifPoeConsumingPwr'], $options_power);
+
+    // Status, prefer POWER-ETHERNET-MIB detection status (reports faults), matched by port name "<unit>/<slot>/<port>"
+    $descr = "$label PoE Status";
+    if ($port && preg_match('!(\d+)/\d+/(\d+)$!', $port['ifDescr'], $matches) &&
+        isset($peth[($matches[1] * 100) . '.' . $matches[2]])) {
+        $index = ($matches[1] * 100) . '.' . $matches[2];
+        discover_status_ng($device, $mib, 'pethPsePortDetectionStatus', ".1.3.6.1.2.1.105.1.1.1.6.$index", $index, 'pethPsePortDetectionStatus', $descr, $peth[$index]['pethPsePortDetectionStatus'], $options);
+    } else {
+        discover_status_ng($device, $mib, 'ifPoePwrStatus', "$oid_status.$ifIndex", $ifIndex, 'ifPoePwrStatus', $descr, $entry['ifPoePwrStatus'], $options);
+    }
+}
+
+unset($oids, $peth, $entry, $unit, $descr, $warn, $options, $options_power, $oid, $oid_power, $oid_status, $ifIndex, $port, $label, $matches, $index);
+
+// EOF
