@@ -89,7 +89,7 @@ def migrate_influxdb_data(
89
89
configuration ,
90
90
new_measurement ,
91
91
read_query = READ_QUERY ,
92
- delete_query = DELETE_QUERY ,
92
+ delete_query = None ,
93
93
):
94
94
Metric = load_model ('monitoring' , 'Metric' )
95
95
metric_qs = Metric .objects .filter (configuration = configuration , key = new_measurement )
@@ -151,39 +151,28 @@ def migrate_influxdb_data(
151
151
152
152
def migrate_wifi_clients ():
153
153
read_query = f"{ READ_QUERY } AND clients != ''"
154
- # Lookup using fields not supported in WHERE clause during deletion.
155
- # Hence, we cannot perform delete operation only for rows that
156
- # contains clients.
157
- delete_query = None
158
154
migrate_influxdb_data (
159
155
new_measurement = 'wifi_clients' ,
160
156
configuration = 'clients' ,
161
157
read_query = read_query ,
162
- delete_query = delete_query ,
163
158
)
164
159
logger .info ('"wifi_clients" measurements successfully migrated.' )
165
160
166
161
167
162
def migrate_traffic_data ():
168
163
migrate_influxdb_data (
169
- new_measurement = 'traffic' ,
170
- configuration = 'traffic' ,
171
- delete_query = f"{ DELETE_QUERY } AND access_tech != ''" ,
164
+ new_measurement = 'traffic' , configuration = 'traffic' , delete_query = DELETE_QUERY
172
165
)
173
166
logger .info ('"traffic" measurements successfully migrated.' )
174
167
175
168
176
169
def migrate_signal_strength_data ():
177
- migrate_influxdb_data (
178
- new_measurement = 'signal' , configuration = 'signal_strength' , delete_query = None
179
- )
170
+ migrate_influxdb_data (new_measurement = 'signal' , configuration = 'signal_strength' )
180
171
logger .info ('"signal_strength" measurements successfully migrated.' )
181
172
182
173
183
174
def migrate_signal_quality_data ():
184
- migrate_influxdb_data (
185
- new_measurement = 'signal' , configuration = 'signal_quality' , delete_query = None
186
- )
175
+ migrate_influxdb_data (new_measurement = 'signal' , configuration = 'signal_quality' )
187
176
logger .info ('"signal_quality" measurements successfully migrated.' )
188
177
189
178
@@ -215,11 +204,14 @@ def migrate_influxdb_structure():
215
204
'Timeseries data migration is already migrated. Skipping migration!'
216
205
)
217
206
return
207
+ # IMPORTANT: Do not change order of below functions.
208
+ # Lookup using fields not supported in WHERE clause during deletion.
209
+ # Migrate traffic data at the end because it is deletes the metrics.
218
210
migrate_wifi_clients ()
219
- migrate_traffic_data ()
220
211
migrate_signal_strength_data ()
221
212
migrate_signal_quality_data ()
222
213
migrate_access_tech_data ()
214
+ migrate_traffic_data ()
223
215
logger .info ('Timeseries data migration completed.' )
224
216
225
217
0 commit comments