Merge pull request #1963 from Sir3lit/maxconn

Add Max Concurrent Connections for database users
This commit is contained in:
Dane Everitt 2020-04-25 11:01:01 -07:00 committed by GitHub
commit 72ecac5236
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 68 additions and 7 deletions

View file

@ -51,7 +51,7 @@ export default ({ database, className }: Props) => {
addError({ key: 'database:delete', message: httpErrorToHuman(error) });
});
};
return (
<React.Fragment>
<Formik

View file

@ -99,6 +99,7 @@
<th>Database Name</th>
<th>Username</th>
<th>Connections From</th>
<th>Max Connections</th>
<th></th>
</tr>
@foreach($databases as $database)
@ -107,6 +108,11 @@
<td class="middle">{{ $database->database }}</td>
<td class="middle">{{ $database->username }}</td>
<td class="middle">{{ $database->remote }}</td>
@if($database->max_connections != null)
<td class="middle">{{ $database->max_connections }}</td>
@else
<td class="middle">Unlimited</td>
@endif
<td class="text-center">
<a href="{{ route('admin.servers.view.database', $database->getRelation('server')->id) }}">
<button class="btn btn-xs btn-primary">Manage</button>

View file

@ -37,6 +37,7 @@
<th>Username</th>
<th>Connections From</th>
<th>Host</th>
<th>Max Conenctions</th>
<th></th>
</tr>
@foreach($server->databases as $database)
@ -45,6 +46,11 @@
<td>{{ $database->username }}</td>
<td>{{ $database->remote }}</td>
<td><code>{{ $database->host->host }}:{{ $database->host->port }}</code></td>
@if($database->max_connections != null)
<td>{{ $database->max_connections }}</td>
@else
<td>Unlimited</td>
@endif
<td class="text-center">
<button data-action="reset-password" data-id="{{ $database->id }}" class="btn btn-xs btn-primary"><i class="fa fa-refresh"></i></button>
<button data-action="remove" data-id="{{ $database->id }}" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></button>
@ -83,6 +89,11 @@
<input id="pRemote" type="text" name="remote" class="form-control" value="%" />
<p class="text-muted small">This should reflect the IP address that connections are allowed from. Uses standard MySQL notation. If unsure leave as <code>%</code>.</p>
</div>
<div class="form-group">
<label for="pmax_connections" class="control-label">Concurrent Connections</label>
<input id="pmax_connections" type="text" name="max_connections" class="form-control"/>
<p class="text-muted small">This should reflect the max number of concurrent connections from this user to the database. Leave empty for unlimited.</p>
</div>
</div>
<div class="box-footer">
{!! csrf_field() !!}