Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
119b3d6e
Commit
119b3d6e
authored
May 27, 2017
by
Gabriel Detraz
Committed by
root
May 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More stats détaillées sur les machines et ip
parent
4f0795a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
logs/views.py
logs/views.py
+6
-2
machines/views.py
machines/views.py
+8
-0
No files found.
logs/views.py
View file @
119b3d6e
...
...
@@ -43,6 +43,7 @@ from users.models import User, ServiceUser, Right, School, ListRight, ListShell,
from
users.models
import
all_has_access
,
all_whitelisted
,
all_baned
,
all_adherent
from
cotisations.models
import
Facture
,
Vente
,
Article
,
Banque
,
Paiement
,
Cotisation
from
machines.models
import
Machine
,
MachineType
,
IpType
,
Extension
,
Interface
,
Domain
,
IpList
from
machines.views
import
all_active_assigned_interfaces_count
,
all_active_interfaces_count
from
topologie.models
import
Switch
,
Port
,
Room
from
re2o.settings
import
PAGINATION_NUMBER
,
PAGINATION_LARGE_NUMBER
...
...
@@ -102,7 +103,8 @@ def stats_general(request):
for
ip_range
in
IpType
.
objects
.
all
():
all_ip
=
IpList
.
objects
.
filter
(
ip_type
=
ip_range
)
used_ip
=
Interface
.
objects
.
filter
(
ipv4__in
=
all_ip
).
count
()
ip
[
ip_range
]
=
[
ip_range
,
all_ip
.
count
(),
used_ip
,
all_ip
.
count
()
-
used_ip
]
active_ip
=
all_active_assigned_interfaces_count
().
filter
(
ipv4__in
=
IpList
.
objects
.
filter
(
ip_type
=
ip_range
)).
count
()
ip
[
ip_range
]
=
[
ip_range
,
all_ip
.
count
(),
used_ip
,
active_ip
,
all_ip
.
count
()
-
used_ip
]
stats
=
[
[[
"Categorie"
,
"Nombre d'utilisateurs"
],
{
'active_users'
:
[
"Users actifs"
,
User
.
objects
.
filter
(
state
=
User
.
STATE_ACTIVE
).
count
()],
...
...
@@ -112,8 +114,10 @@ def stats_general(request):
'connexion_users'
:
[
"Utilisateurs bénéficiant d'une connexion"
,
all_has_access
().
count
()],
'ban_users'
:
[
"Utilisateurs bannis"
,
all_baned
().
count
()],
'whitelisted_user'
:
[
"Utilisateurs bénéficiant d'une connexion gracieuse"
,
all_whitelisted
().
count
()],
'actives_interfaces'
:
[
"Interfaces actives (ayant accès au reseau)"
,
all_active_interfaces_count
().
count
()],
'actives_assigned_interfaces'
:
[
"Interfaces actives et assignées ipv4"
,
all_active_assigned_interfaces_count
().
count
()]
}],
[[
"Range d'ip"
,
"Nombre d'ip totales"
,
"
Nombre d'ip utilisées"
,
"Nombre d'ip libr
es"
]
,
ip
]
[[
"Range d'ip"
,
"Nombre d'ip totales"
,
"
Ip assignées"
,
"Ip assignées à une machine active"
,
"Ip non assigné
es"
]
,
ip
]
]
return
render
(
request
,
'logs/stats_general.html'
,
{
'stats_list'
:
stats
})
...
...
machines/views.py
View file @
119b3d6e
...
...
@@ -72,6 +72,14 @@ def all_active_assigned_interfaces():
""" Renvoie l'ensemble des machines qui ont une ipv4 assignées et disposant de l'accès internet"""
return
all_active_interfaces
().
filter
(
ipv4__isnull
=
False
)
def
all_active_interfaces_count
():
""" Version light seulement pour compter"""
return
Interface
.
objects
.
filter
(
machine__in
=
Machine
.
objects
.
filter
(
user__in
=
all_has_access
()).
filter
(
active
=
True
))
def
all_active_assigned_interfaces_count
():
""" Version light seulement pour compter"""
return
all_active_interfaces_count
().
filter
(
ipv4__isnull
=
False
)
def
unassign_ips
(
user
):
machines
=
user
.
user_interfaces
()
for
machine
in
machines
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment