|
112 | 112 | <tr><td><span ng-if="settings.confgroup==''" class="label label-primary">DEFAULT</span><span ng-if="settings.confgroup!=''" class="label label-warning">{{settings.confgroup}}</span></td><td><span class="label label-warning">{{settings.topology}}</span></td></tr>
|
113 | 113 | </table>
|
114 | 114 |
|
115 |
| - |
| 115 | + |
116 | 116 | </div>
|
117 | 117 | <div flex-gt-xs="10" ></div>
|
118 | 118 | <div flex-gt-xs="60" class="col-lg-66">
|
|
136 | 136 | <tr>
|
137 | 137 | <th>Host</th>
|
138 | 138 | <th>Port</th>
|
| 139 | + <th>Version</th> |
139 | 140 | <th>Status</th>
|
140 |
| - <th>Using GTID</th> |
141 |
| - <th>Current GTID</th> |
142 |
| - <th>Slave GTID Pos</th> |
| 141 | + <th ng-if="server.DBVersion.Flavor=='MariaDB'">Using GTID</th> |
| 142 | + <th ng-if="server.DBVersion.Flavor=='MariaDB'">Current GTID</th> |
| 143 | + <th ng-if="server.DBVersion.Flavor=='MariaDB'">Slave GTID Pos</th> |
| 144 | + <th ng-if="server.DBVersion.Flavor!='MariaDB'">Executed GTID Set</th> |
143 | 145 | <th>IO Thread</th>
|
144 | 146 | <th>SQL Thread</th>
|
145 | 147 | <th>Delay</th>
|
|
152 | 154 | <tr ng-repeat="server in servers" ng-class="{'active':server.State=='Master','danger': server.State=='SlaveErr','warning': server.State=='SlaveLate' }">
|
153 | 155 | <td>{{server.Host}}</td>
|
154 | 156 | <td>{{server.Port}}</td>
|
| 157 | + <td>{{server.DBVersion.Flavor}} {{server.DBVersion.Major}}.{{server.DBVersion.Minor}}</td> |
155 | 158 | <td>{{server.State}}</td>
|
156 |
| - <td>{{server.UsingGtid}}</td> |
157 |
| - <td>{{gtidstring(server.CurrentGtid)}}</td> |
158 |
| - <td>{{gtidstring(server.SlaveGtid)}}</td> |
| 159 | + <td ng-if="server.DBVersion.Flavor=='MariaDB'">{{server.UsingGtid}}</td> |
| 160 | + <td ng-if="server.DBVersion.Flavor=='MariaDB'">{{gtidstring(server.CurrentGtid)}}</td> |
| 161 | + <td ng-if="server.DBVersion.Flavor=='MariaDB'">{{gtidstring(server.SlaveGtid)}}</td> |
| 162 | + <td ng-if="server.DBVersion.Flavor!='MariaDB'">{{server.GTIDExecuted}}</td> |
159 | 163 | <td>{{server.IOThread}}</td>
|
160 |
| - <td>{{server.SQLThread }}</td> |
| 164 | + <td>{{server.SQLThread}}</td> |
161 | 165 | <td>{{server.Delay.Int64}}</td>
|
162 | 166 | <td>{{server.ReadOnly}}</td>
|
163 | 167 | <td>{{server.FailCount}}/{{server.FailSuspectHeartbeat}}</td>
|
|
0 commit comments